diff options
Diffstat (limited to 'src/support/win32/locale_win32.cpp')
| -rw-r--r-- | src/support/win32/locale_win32.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/support/win32/locale_win32.cpp b/src/support/win32/locale_win32.cpp index ee13811171551..acbf79ac197c0 100644 --- a/src/support/win32/locale_win32.cpp +++ b/src/support/win32/locale_win32.cpp @@ -13,8 +13,6 @@ #include <memory> #include <type_traits> -#include <crtversion.h> - typedef _VSTD::remove_pointer<locale_t>::type __locale_struct; typedef _VSTD::unique_ptr<__locale_struct, decltype(&uselocale)> __locale_raii; @@ -31,9 +29,8 @@ locale_t uselocale( locale_t newloc ) // uselocale sets the thread's locale by definition, so unconditionally use thread-local locale _configthreadlocale( _ENABLE_PER_THREAD_LOCALE ); // uselocale sets all categories -#if _VC_CRT_MAJOR_VERSION < 14 - setlocale( LC_ALL, newloc->locinfo->lc_category[LC_ALL].locale ); -#endif + // disable setting locale on Windows temporarily because the structure is opaque (PR31516) + //setlocale( LC_ALL, newloc->locinfo->lc_category[LC_ALL].locale ); // uselocale returns the old locale_t return old_locale; } |