RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 02:32:36 +01:00
Code Issues Releases Wiki Activity

Silence deprecation warnings on MacOs

Browse Source
This commit is contained in:
Megamouse 2024-08-01 01:11:54 +02:00
parent 56b6b7e732
commit 319c533196
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
Utilities/StrFmt.cpp
View File

@ -17,6 +17,16 @@
#include <errno.h> #include <errno.h>
#endif #endif
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
std::string wchar_to_utf8(std::wstring_view src) std::string wchar_to_utf8(std::wstring_view src)
{ {
#ifdef _WIN32 #ifdef _WIN32
@ -32,16 +42,6 @@ std::string wchar_to_utf8(std::wstring_view src)
#endif #endif
} }
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable : 4996)
#elif defined(__clang__)
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
#else
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
#endif
std::string utf16_to_utf8(std::u16string_view src) std::string utf16_to_utf8(std::u16string_view src)
{ {
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{}; std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
@ -53,13 +53,6 @@ std::u16string utf8_to_utf16(std::string_view src)
std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{}; std::wstring_convert<std::codecvt_utf8_utf16<char16_t>, char16_t> converter{};
return converter.from_bytes(src.data()); return converter.from_bytes(src.data());
} }
#ifdef _MSC_VER
#pragma warning(pop)
#elif defined(__clang__)
#pragma clang diagnostic pop
#else
#pragma GCC diagnostic pop
#endif
std::wstring utf8_to_wchar(std::string_view src) std::wstring utf8_to_wchar(std::string_view src)
{ {
@ -75,6 +68,13 @@ std::wstring utf8_to_wchar(std::string_view src)
return converter.from_bytes(src.data()); return converter.from_bytes(src.data());
#endif #endif
} }
#ifdef _MSC_VER
#pragma warning(pop)
#elif defined(__clang__)
#pragma clang diagnostic pop
#else
#pragma GCC diagnostic pop
#endif
#ifdef _WIN32 #ifdef _WIN32
std::string fmt::win_error_to_string(unsigned long error, void* module_handle) std::string fmt::win_error_to_string(unsigned long error, void* module_handle)