diff options
| author | Morph <39850852+Morph1984@users.noreply.github.com> | 2023-07-09 01:45:00 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-09 01:45:00 -0400 |
| commit | 9ce5d39829b5e009f220dfa7bf6e4834d250c5c0 (patch) | |
| tree | 35c7f311cfd0b01e3b04793e447f84d171752224 /src | |
| parent | f80edad10920247fee34422c14b4b22d6228cd14 (diff) | |
| parent | 302a7351351e9235cf36d364930243c79459a69d (diff) | |
Merge pull request #11030 from lat9nq/tz-restrict-msvc
settings: Disable C++20 time zone path on MSVC
Diffstat (limited to 'src')
| -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() { std::string location_name; if (time_zone_index == 0) { // Auto -#if __cpp_lib_chrono >= 201907L +#if __cpp_lib_chrono >= 201907L && !defined(_MSC_VER) + // TODO: Remove `!defined(_MSC_VER)` when we no longer support Windows 10 1809 LTSC const struct std::chrono::tzdb& time_zone_data = std::chrono::get_tzdb(); try { const std::chrono::time_zone* current_zone = time_zone_data.current_zone(); |