diff --git a/Utilities/StrFmt.cpp b/Utilities/StrFmt.cpp index 5c7d9b3836..1a28f4be94 100644 --- a/Utilities/StrFmt.cpp +++ b/Utilities/StrFmt.cpp @@ -31,6 +31,8 @@ std::string wchar_to_utf8(std::wstring_view src) #endif } +#pragma GCC diagnostic push +#pragma GCC diagnostic ignored "-Wdeprecated-declarations" std::string utf16_to_utf8(std::u16string_view src) { std::wstring_convert, char16_t> converter{}; @@ -42,6 +44,7 @@ std::u16string utf8_to_utf16(std::string_view src) std::wstring_convert, char16_t> converter{}; return converter.from_bytes(src.data()); } +#pragma GCC diagnostic pop std::wstring utf8_to_wchar(std::string_view src) { diff --git a/rpcs3/Emu/savestate_utils.cpp b/rpcs3/Emu/savestate_utils.cpp index 663f0421aa..6bc53fc7f1 100644 --- a/rpcs3/Emu/savestate_utils.cpp +++ b/rpcs3/Emu/savestate_utils.cpp @@ -120,7 +120,7 @@ std::vector get_savestate_versioning_data(fs::file&& file, std::s ar.breathe(true); std::vector ver_data = ar.pop>(); - return std::move(ver_data); + return ver_data; } bool is_savestate_version_compatible(const std::vector& data, bool is_boot_check) @@ -183,10 +183,10 @@ std::string get_savestate_file(std::string_view title_id, std::string_view boot_ if (std::string path_compressed = path + ".gz"; fs::is_file(path_compressed)) { - return std::move(path_compressed); + return path_compressed; } - return std::move(path); + return path; } bool is_savestate_compatible(fs::file&& file, std::string_view filepath) diff --git a/rpcs3/util/serialization_ext.cpp b/rpcs3/util/serialization_ext.cpp index e16c5eaa93..d4c23ce2e6 100644 --- a/rpcs3/util/serialization_ext.cpp +++ b/rpcs3/util/serialization_ext.cpp @@ -658,9 +658,6 @@ void compressed_serialization_file_handler::file_writer_thread_op() { compressed_stream_data& stream = *m_stream; - // Data recheck after an abort request is detected so there will not be any missed data - bool rechecked = false; - while (true) { stream.m_queued_data_to_write.wait();