浏览代码

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

stopiccot 12 年之前
父节点
当前提交
1fca335a2c
共有 1 个文件被更改,包括 1 次插入2 次删除
  1. 1 2
      lib/logging/CLogger.cpp

+ 1 - 2
lib/logging/CLogger.cpp

@@ -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);