From b3ffcdf91608d4435acfb9b0a6266a4073ffaf7f Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Fri, 1 May 2015 13:32:25 +0200 Subject: don't imbue boost::filesystem::path with locale "C" on windows fixes https://github.com/bitcoin/bitcoin/issues/6078 --- src/util.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src') diff --git a/src/util.cpp b/src/util.cpp index c9e8242d47..37fd326f27 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -738,7 +738,9 @@ void SetupEnvironment() #endif // The path locale is lazy initialized and to avoid deinitialization errors // in multithreading environments, it is set explicitly by the main thread. +#if !defined(WIN32) boost::filesystem::path::imbue(loc); +#endif } void SetThreadPriority(int nPriority) -- cgit v1.2.3 From 3da78490073b04f52f0136e17b07246cc37bedf1 Mon Sep 17 00:00:00 2001 From: Jonas Schnelli Date: Sat, 2 May 2015 10:10:31 +0200 Subject: [squashme] simplify SetupEnvironment() (by dexX7) --- src/util.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/util.cpp b/src/util.cpp index 37fd326f27..da5b259aee 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -726,21 +726,21 @@ void RenameThread(const char* name) void SetupEnvironment() { - std::locale loc("C"); // On most POSIX systems (e.g. Linux, but not BSD) the environment's locale // may be invalid, in which case the "C" locale is used as fallback. #if !defined(WIN32) && !defined(MAC_OSX) && !defined(__FreeBSD__) && !defined(__OpenBSD__) try { - loc = std::locale(""); // Raises a runtime error if current locale is invalid + std::locale(""); // Raises a runtime error if current locale is invalid } catch (const std::runtime_error&) { setenv("LC_ALL", "C", 1); } #endif - // The path locale is lazy initialized and to avoid deinitialization errors + // The path locale is lazy initialized and to avoid deinitialization errors // in multithreading environments, it is set explicitly by the main thread. -#if !defined(WIN32) + // A dummy locale is used to extract the internal default locale, used by + // boost::filesystem::path, which is then used to explicitly imbue the path. + std::locale loc = boost::filesystem::path::imbue(std::locale::classic()); boost::filesystem::path::imbue(loc); -#endif } void SetThreadPriority(int nPriority) -- cgit v1.2.3