Merge pull request #10740 from Tilka/cxx20

Move to C++20 for non-MSVC compilers
dolphin-emu · Aug 4, 2022 · f59f1a2 · f59f1a2
2 parents 3ad6e3a + d033d92
commit f59f1a2
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/Externals/fmt/include/fmt/format.h b/Externals/fmt/include/fmt/format.h
@@ -2198,7 +2198,7 @@ FMT_CONSTEXPR20 auto do_write_float(OutputIt out, const DecimalFP& fp,
     -> OutputIt {
   auto significand = fp.significand;
   int significand_size = get_significand_size(fp);
-  static constexpr Char zero = static_cast<Char>('0');
+  const Char zero = static_cast<Char>('0');
   auto sign = fspecs.sign;
   size_t size = to_unsigned(significand_size) + (sign ? 1 : 0);
   using iterator = reserve_iterator<OutputIt>;

diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
@@ -18,7 +18,7 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows")
 endif()
 
 if (NOT MSVC)
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 20)
   set(CMAKE_CXX_STANDARD_REQUIRED ON)
   set(CMAKE_CXX_EXTENSIONS OFF)
 endif()

diff --git a/Source/Core/Common/CDUtils.cpp b/Source/Core/Common/CDUtils.cpp
@@ -195,7 +195,7 @@ std::vector<std::string> GetCDDevices()
   {
     for (unsigned int j = checklist[i].num_min; j <= checklist[i].num_max; ++j)
     {
-      std::string drive = fmt::format(checklist[i].format, j);
+      std::string drive = fmt::format(fmt::runtime(checklist[i].format), j);
       if (IsCDROM(drive))
       {
         drives.push_back(std::move(drive));

diff --git a/Source/Core/UICommon/GameFile.cpp b/Source/Core/UICommon/GameFile.cpp
@@ -291,7 +291,7 @@ void GameFile::DownloadDefaultCover()
   }
 
   Common::HttpRequest request;
-  constexpr char cover_url[] = "https://art.gametdb.com/wii/cover/{}/{}.png";
+  static constexpr char cover_url[] = "https://art.gametdb.com/wii/cover/{}/{}.png";
   const auto response = request.Get(fmt::format(cover_url, region_code, m_gametdb_id));
 
   if (!response)