From 9b47561c8920cec5e1907fd190854f79b32b500c Mon Sep 17 00:00:00 2001
From: Stenzek <stenzek@gmail.com>
Date: Tue, 5 Sep 2023 20:56:05 +1000
Subject: [PATCH] Misc: C++20 fixes

---
 src/common-tests/path_tests.cpp | 24 ++++++++++++------------
 src/core/achievements.cpp       |  6 +++---
 src/core/system.cpp             |  2 +-
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/common-tests/path_tests.cpp b/src/common-tests/path_tests.cpp
index d85e94aee..c0e585269 100644
--- a/src/common-tests/path_tests.cpp
+++ b/src/common-tests/path_tests.cpp
@@ -229,18 +229,18 @@ TEST(FileSystem, ChangeFileName)
 
 TEST(FileSystem, SanitizeFileName)
 {
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo"), u8"foo");
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo/bar"), u8"foo_bar");
-  ASSERT_EQ(Path::SanitizeFileName(u8"f🙃o"), u8"f🙃o");
-  ASSERT_EQ(Path::SanitizeFileName(u8"ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱"), u8"ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱");
-  ASSERT_EQ(Path::SanitizeFileName(u8"abcdefghijlkmnopqrstuvwxyz-0123456789+&=_[]{}"), u8"abcdefghijlkmnopqrstuvwxyz-0123456789+&=_[]{}");
-  ASSERT_EQ(Path::SanitizeFileName(u8"some*path**with*asterisks"), u8"some_path__with_asterisks");
+  ASSERT_EQ(Path::SanitizeFileName("foo"), "foo");
+  ASSERT_EQ(Path::SanitizeFileName("foo/bar"), "foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName("f🙃o"), "f🙃o");
+  ASSERT_EQ(Path::SanitizeFileName("ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱"), "ŻąłóРстуぬねのはen🍪⟑η∏☉ⴤℹ︎∩₲ ₱⟑♰⫳🐱");
+  ASSERT_EQ(Path::SanitizeFileName("abcdefghijlkmnopqrstuvwxyz-0123456789+&=_[]{}"), "abcdefghijlkmnopqrstuvwxyz-0123456789+&=_[]{}");
+  ASSERT_EQ(Path::SanitizeFileName("some*path**with*asterisks"), "some_path__with_asterisks");
 #ifdef _WIN32
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo:"), u8"foo_");
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo:bar."), u8"foo_bar_");
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo\\bar"), u8"foo_bar");
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo>bar"), u8"foo_bar");
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo\\bar", false), u8"foo\\bar");
+  ASSERT_EQ(Path::SanitizeFileName("foo:"), "foo_");
+  ASSERT_EQ(Path::SanitizeFileName("foo:bar."), "foo_bar_");
+  ASSERT_EQ(Path::SanitizeFileName("foo\\bar"), "foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName("foo>bar"), "foo_bar");
+  ASSERT_EQ(Path::SanitizeFileName("foo\\bar", false), "foo\\bar");
 #endif
-  ASSERT_EQ(Path::SanitizeFileName(u8"foo/bar", false), u8"foo/bar");
+  ASSERT_EQ(Path::SanitizeFileName("foo/bar", false), "foo/bar");
 }
\ No newline at end of file
diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp
index b3ed52903..9d74b5299 100644
--- a/src/core/achievements.cpp
+++ b/src/core/achievements.cpp
@@ -1720,7 +1720,7 @@ void Achievements::DeactivateAchievement(Achievement* achievement)
   if (achievement->primed)
   {
     achievement->primed = false;
-    s_primed_achievement_count.fetch_sub(std::memory_order_acq_rel);
+    s_primed_achievement_count.fetch_sub(1, std::memory_order_acq_rel);
   }
 
   Log_DevPrintf("Deactivated achievement %s (%u)", achievement->title.c_str(), achievement->id);
@@ -1888,7 +1888,7 @@ void Achievements::AchievementPrimed(u32 achievement_id)
     return;
 
   achievement->primed = true;
-  s_primed_achievement_count.fetch_add(std::memory_order_acq_rel);
+  s_primed_achievement_count.fetch_add(1, std::memory_order_acq_rel);
 }
 
 void Achievements::AchievementUnprimed(u32 achievement_id)
@@ -1899,7 +1899,7 @@ void Achievements::AchievementUnprimed(u32 achievement_id)
     return;
 
   achievement->primed = false;
-  s_primed_achievement_count.fetch_sub(std::memory_order_acq_rel);
+  s_primed_achievement_count.fetch_sub(1, std::memory_order_acq_rel);
 }
 
 std::pair<u32, u32> Achievements::GetAchievementProgress(const Achievement& achievement)
diff --git a/src/core/system.cpp b/src/core/system.cpp
index 51b1d934f..eac7c2fad 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -1316,7 +1316,7 @@ bool System::BootSystem(SystemBootParameters parameters)
   if (disc && parameters.media_playlist_index != 0 && !disc->SwitchSubImage(parameters.media_playlist_index, &error))
   {
     Host::ReportErrorAsync("Error",
-                           fmt::format("Failed to switch to subimage {] in '{}': {}", parameters.media_playlist_index,
+                           fmt::format("Failed to switch to subimage {} in '{}': {}", parameters.media_playlist_index,
                                        parameters.filename, error.GetDescription()));
     s_state = State::Shutdown;
     Host::OnSystemDestroyed();