From be37feffc3bb890c221483e2f32f19020a849d23 Mon Sep 17 00:00:00 2001
From: "Stephan T. Lavavej" <stl@microsoft.com>
Date: Thu, 13 Nov 2025 05:13:23 -0800
Subject: [PATCH] Avoid using non-Standard std::locale::empty() for MSVC

---
 src/Base/Reader.cpp | 4 ----
 src/Base/Writer.cpp | 8 --------
 2 files changed, 12 deletions(-)

diff --git a/src/Base/Reader.cpp b/src/Base/Reader.cpp
index 19e4e1c75c..b80fbaedc5 100644
--- a/src/Base/Reader.cpp
+++ b/src/Base/Reader.cpp
@@ -65,11 +65,7 @@ using namespace std;
 Base::XMLReader::XMLReader(const char* FileName, std::istream& str)
     : _File(FileName)
 {
-#ifdef _MSC_VER
-    str.imbue(std::locale::empty());
-#else
     str.imbue(std::locale::classic());
-#endif
 
     // create the parser
     parser = XMLReaderFactory::createXMLReader();  // NOLINT
diff --git a/src/Base/Writer.cpp b/src/Base/Writer.cpp
index 65b4bef898..cd1126e945 100644
--- a/src/Base/Writer.cpp
+++ b/src/Base/Writer.cpp
@@ -318,11 +318,7 @@ void Writer::putNextEntry(const char* file, const char* obj)
 ZipWriter::ZipWriter(const char* FileName)
     : ZipStream(FileName)
 {
-#ifdef _MSC_VER
-    ZipStream.imbue(std::locale::empty());
-#else
     ZipStream.imbue(std::locale::classic());
-#endif
     ZipStream.precision(std::numeric_limits<double>::digits10 + 1);
     ZipStream.setf(std::ios::fixed, std::ios::floatfield);
 }
@@ -330,11 +326,7 @@ ZipWriter::ZipWriter(const char* FileName)
 ZipWriter::ZipWriter(std::ostream& os)
     : ZipStream(os)
 {
-#ifdef _MSC_VER
-    ZipStream.imbue(std::locale::empty());
-#else
     ZipStream.imbue(std::locale::classic());
-#endif
     ZipStream.precision(std::numeric_limits<double>::digits10 + 1);
     ZipStream.setf(std::ios::fixed, std::ios::floatfield);
 }