diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:54:39 +0000 |
commit | 267c6f2ac71f92999e969232431ba04678e7437e (patch) | |
tree | 358c9467650e1d0a1d7227a21dac2e3d08b622b2 /external/libnumbertext/deprecated.patch.0 | |
parent | Initial commit. (diff) | |
download | libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.tar.xz libreoffice-267c6f2ac71f92999e969232431ba04678e7437e.zip |
Adding upstream version 4:24.2.0.upstream/4%24.2.0
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'external/libnumbertext/deprecated.patch.0')
-rw-r--r-- | external/libnumbertext/deprecated.patch.0 | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/external/libnumbertext/deprecated.patch.0 b/external/libnumbertext/deprecated.patch.0 new file mode 100644 index 0000000000..8ee86ac135 --- /dev/null +++ b/external/libnumbertext/deprecated.patch.0 @@ -0,0 +1,43 @@ +--- src/Numbertext.cxx ++++ src/Numbertext.cxx +@@ -41,7 +41,14 @@ + std::wifstream wif(filename); + if (wif.fail()) + return false; ++#if defined __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif + wif.imbue(std::locale(std::locale(), new std::codecvt_utf8<wchar_t>)); ++#if defined __GNUC__ ++#pragma GCC diagnostic pop ++#endif + std::wstringstream wss; + wss << wif.rdbuf(); + result = wss.str(); +@@ -122,8 +129,15 @@ + MultiByteToWideChar(CP_UTF8, 0, s.c_str(), -1, wstr.get(), nSize); + return wstr.get(); + #elif !defined NUMBERTEXT_BOOST ++#if defined __GNUC__ ++#pragma GCC diagnostic push ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif + typedef std::codecvt_utf8<wchar_t> convert_type; + std::wstring_convert<convert_type, wchar_t> converter; ++#if defined __GNUC__ ++#pragma GCC diagnostic pop ++#endif + return converter.from_bytes( s ); + #else + return ::locale::conv::utf_to_utf<wchar_t>(s.c_str(), s.c_str() + s.size()); +@@ -138,6 +152,9 @@ + WideCharToMultiByte(CP_UTF8, 0, s.c_str(), -1, str.get(), nSize, nullptr, nullptr); + return str.get(); + #elif !defined NUMBERTEXT_BOOST ++#if defined __GNUC__ ++#pragma GCC diagnostic ignored "-Wdeprecated-declarations" ++#endif + typedef std::codecvt_utf8<wchar_t> convert_type; + std::wstring_convert<convert_type, wchar_t> converter; + return converter.to_bytes( s ); |