From ed0025e3052f0228560602cd799f3bb18122bffb Mon Sep 17 00:00:00 2001 From: rahuel Date: Thu, 9 Feb 2006 16:33:22 +0000 Subject: [PATCH] using namespace std ; Must follow the includes static mutex not initialized --- src/SALOMELocalTrace/BaseTraceCollector.cxx | 6 +++--- src/SALOMELocalTrace/LocalTraceBufferPool.cxx | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/SALOMELocalTrace/BaseTraceCollector.cxx b/src/SALOMELocalTrace/BaseTraceCollector.cxx index de6121897..d70735f67 100644 --- a/src/SALOMELocalTrace/BaseTraceCollector.cxx +++ b/src/SALOMELocalTrace/BaseTraceCollector.cxx @@ -29,15 +29,15 @@ #include #include -using namespace std; - #include "BaseTraceCollector.hxx" #include "LocalTraceBufferPool.hxx" +using namespace std; + // Class attributes initialisation, for class method BaseTraceCollector::run BaseTraceCollector* BaseTraceCollector::_singleton = 0; -pthread_mutex_t BaseTraceCollector::_singletonMutex; +pthread_mutex_t BaseTraceCollector::_singletonMutex = PTHREAD_MUTEX_INITIALIZER ; sem_t BaseTraceCollector::_sem; int BaseTraceCollector::_threadToClose = 0; pthread_t* BaseTraceCollector::_threadId = 0; // used to control single run diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx index c7d321ec6..a6ffdb3c0 100644 --- a/src/SALOMELocalTrace/LocalTraceBufferPool.cxx +++ b/src/SALOMELocalTrace/LocalTraceBufferPool.cxx @@ -51,12 +51,12 @@ using namespace std; // Class static attributes initialisation LocalTraceBufferPool* LocalTraceBufferPool::_singleton = 0; -#ifndef WNT -pthread_mutex_t LocalTraceBufferPool::_singletonMutex; -#else +//#ifndef WNT +//pthread_mutex_t LocalTraceBufferPool::_singletonMutex; +//#else pthread_mutex_t LocalTraceBufferPool::_singletonMutex = PTHREAD_MUTEX_INITIALIZER; -#endif +//#endif BaseTraceCollector *LocalTraceBufferPool::_myThreadTrace = 0; // ============================================================================ -- 2.39.2