aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2015-05-10 14:21:38 +0200
committerWladimir J. van der Laan <laanwj@gmail.com>2015-05-10 14:22:53 +0200
commit23254131a3fdaeae9c50dafca6d0addbbf235820 (patch)
treed4ee7f3970fecea7f2c1931bb4c2df2cfbc315b3 /src
parent7eb66182f3799e695f655e40d58ed2fdaa7044e1 (diff)
parent3da78490073b04f52f0136e17b07246cc37bedf1 (diff)
Merge pull request #6093
3da7849 [squashme] simplify SetupEnvironment() (by dexX7) (Jonas Schnelli) b3ffcdf don't imbue boost::filesystem::path with locale "C" on windows (Jonas Schnelli)
Diffstat (limited to 'src')
-rw-r--r--src/util.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/util.cpp b/src/util.cpp
index c9e8242d47..da5b259aee 100644
--- a/src/util.cpp
+++ b/src/util.cpp
@@ -726,18 +726,20 @@ 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.
+ // 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);
}