diff options
| author |  Morph | 2023-07-09 01:45:00 -0400 |
|---|---|---|
| committer |  GitHub | 2023-07-09 01:45:00 -0400 |
| commit | 9ce5d39829b5e009f220dfa7bf6e4834d250c5c0 (patch) | |
| tree | 35c7f311cfd0b01e3b04793e447f84d171752224 /src/common/settings.cpp | |
| parent | Merge pull request #11049 from Morph1984/gha (diff) | |
| parent | settings: Disable C++20 path on MSVC (diff) | |
| download | yuzu-9ce5d39829b5e009f220dfa7bf6e4834d250c5c0.tar.gz yuzu-9ce5d39829b5e009f220dfa7bf6e4834d250c5c0.tar.xz yuzu-9ce5d39829b5e009f220dfa7bf6e4834d250c5c0.zip | |
Merge pull request #11030 from lat9nq/tz-restrict-msvc
settings: Disable C++20 time zone path on MSVC
Diffstat (limited to 'src/common/settings.cpp')
| -rw-r--r-- | src/common/settings.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/common/settings.cpp b/src/common/settings.cpp index 6cbbea1b2..c81909a06 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp | |||
| @@ -26,7 +26,8 @@ std::string GetTimeZoneString() { | |||
| 26 | 26 | ||
| 27 | std::string location_name; | 27 | std::string location_name; |
| 28 | if (time_zone_index == 0) { // Auto | 28 | if (time_zone_index == 0) { // Auto |
| 29 | #if __cpp_lib_chrono >= 201907L | 29 | #if __cpp_lib_chrono >= 201907L && !defined(_MSC_VER) |
| 30 | // TODO: Remove `!defined(_MSC_VER)` when we no longer support Windows 10 1809 LTSC | ||
| 30 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); | 31 | const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); |
| 31 | try { | 32 | try { |
| 32 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); | 33 | const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |