diff options
| author | Tillmann Karras <tilkax@gmail.com> | 2022-06-11 14:39:04 +0100 |
|---|---|---|
| committer | Tillmann Karras <tilkax@gmail.com> | 2022-07-30 23:35:53 +0100 |
| commit | d033d92b0524c23e1274f07c9cbaa02ead770bbc (patch) | |
| tree | 7fc438af03f65b226a5871a54edc23f36ac97667 /Source | |
| parent | 92c7566646924eb6e7501c98edaca2a37b1bedab (diff) | |
Move to C++20 for non-MSVC compilers
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | Source/Core/Common/CDUtils.cpp | 2 | ||||
| -rw-r--r-- | Source/Core/UICommon/GameFile.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt index cca7a20f2a..7e5b548864 100644 --- 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 index 630f5d943d..d17b3d4ab3 100644 --- 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 index 6e33f480e0..e605f987eb 100644 --- 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) |