diff options
| author | Michael Kruse <llvm-project@meinersbur.de> | 2025-01-03 10:22:51 +0100 |
|---|---|---|
| committer | Michael Kruse <llvm-project@meinersbur.de> | 2025-01-03 10:22:51 +0100 |
| commit | 38500d63e14ce340236840f60d356cdefb56a52c (patch) | |
| tree | 17edbec446ce9b50d2f215a483b83afb293a635d /libcxx/src/iostream.cpp | |
| parent | 1a3d5daaef7a6a63448a497da3eff7fc9e23df26 (diff) | |
| parent | 27f30029741ecf023baece7b3dde1ff9011ffefc (diff) | |
Merge branch 'main' into users/meinersbur/flang_runtime_split-headersusers/meinersbur/flang_runtime_split-headers
Diffstat (limited to 'libcxx/src/iostream.cpp')
| -rw-r--r-- | libcxx/src/iostream.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libcxx/src/iostream.cpp b/libcxx/src/iostream.cpp index ee33f4bae6d8..6db02d560379 100644 --- a/libcxx/src/iostream.cpp +++ b/libcxx/src/iostream.cpp @@ -11,10 +11,6 @@ #include <new> #include <string> -#ifdef _LIBCPP_MSVCRT_LIKE -# include <__locale_dir/locale_guard.h> -#endif - #define _str(s) #s #define str(s) _str(s) #define _LIBCPP_ABI_NAMESPACE_STR str(_LIBCPP_ABI_NAMESPACE) @@ -109,7 +105,7 @@ static void force_locale_initialization() { static bool once = []() { auto loc = __locale::__newlocale(LC_ALL_MASK, "C", 0); { - __locale_guard g(loc); // forces initialization of locale TLS + __locale::__locale_guard g(loc); // forces initialization of locale TLS ((void)g); } __locale::__freelocale(loc); |