mirror of
https://github.com/vcmi/vcmi.git
synced 2024-12-24 22:14:36 +02:00
Be careful with global var initialization order. All mutexes should be initialized before all CLoggers. Caused a crash on OS X when compiling with clang
This commit is contained in:
parent
03c2aa9153
commit
1fca335a2c
@ -49,6 +49,7 @@ CLoggerStream::~CLoggerStream()
|
|||||||
}
|
}
|
||||||
|
|
||||||
boost::recursive_mutex CLogger::smx;
|
boost::recursive_mutex CLogger::smx;
|
||||||
|
boost::recursive_mutex CLogManager::smx;
|
||||||
|
|
||||||
DLL_LINKAGE CLogger * logGlobal = CLogger::getGlobalLogger();
|
DLL_LINKAGE CLogger * logGlobal = CLogger::getGlobalLogger();
|
||||||
|
|
||||||
@ -230,8 +231,6 @@ CTraceLogger::~CTraceLogger()
|
|||||||
logger->traceStream() << endMessage;
|
logger->traceStream() << endMessage;
|
||||||
}
|
}
|
||||||
|
|
||||||
boost::recursive_mutex CLogManager::smx;
|
|
||||||
|
|
||||||
CLogManager & CLogManager::get()
|
CLogManager & CLogManager::get()
|
||||||
{
|
{
|
||||||
TLockGuardRec _(smx);
|
TLockGuardRec _(smx);
|
||||||
|
Loading…
Reference in New Issue
Block a user