Skip to content

Commit

Permalink
Initialization: set Boost path locale in main thread
Browse files Browse the repository at this point in the history
The path locale is lazy initialized and to avoid deinitialization errors
in multithreading environments, it is set explicitly by the main thread.
  • Loading branch information
dexX7 committed Mar 11, 2015
1 parent d734d87 commit 317e66c
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/util.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -723,18 +723,18 @@ void RenameThread(const char* name)

void SetupEnvironment()
{
#ifndef WIN32
try
{
#if BOOST_FILESYSTEM_VERSION == 3
boost::filesystem::path::codecvt(); // Raises runtime error if current locale is invalid
#else // boost filesystem v2
std::locale(); // Raises runtime error if current locale is invalid
#endif
// 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 {
std::locale(""); // Raises a runtime error if current locale is invalid
} catch (const std::runtime_error&) {
setenv("LC_ALL", "C", 1); // Force C locale
std::locale::global(std::locale("C"));
}
#endif
// The path locale is lazy initialized and to avoid deinitialization errors
// in multithreading environments, it is set explicitly by the main thread.
boost::filesystem::path::imbue(std::locale());
}

void SetThreadPriority(int nPriority)
Expand Down

0 comments on commit 317e66c

Please sign in to comment.