From 6ce4709adcd681c44b9b036c4efbc022cf98aaa7 Mon Sep 17 00:00:00 2001 From: adam Date: Mon, 21 Feb 2011 13:29:30 +0000 Subject: [PATCH] Remove warnings --- src/Basics/BasicsGenericDestructor.cxx | 4 ++++ src/Communication/Receivers.cxx | 1 - src/Communication/SALOME_Comm_i.cxx | 3 +-- src/MPIContainer/MPIContainer_i.cxx | 4 ++++ src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx | 4 ++++ 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/Basics/BasicsGenericDestructor.cxx b/src/Basics/BasicsGenericDestructor.cxx index 414815daf..77862d830 100644 --- a/src/Basics/BasicsGenericDestructor.cxx +++ b/src/Basics/BasicsGenericDestructor.cxx @@ -118,8 +118,12 @@ public: DEVTRACE("atExitSingleton(" << Make_ATEXIT << ")"); assert(GENERIC_DESTRUCTOR::Destructors == 0); GENERIC_DESTRUCTOR::Destructors = new std::list; +#ifndef _DEBUG_ + atexit(HouseKeeping); +#else int cr = atexit(HouseKeeping); assert(cr == 0); +#endif atExitSingletonDone = true; } } diff --git a/src/Communication/Receivers.cxx b/src/Communication/Receivers.cxx index fcba94427..eb7c4b0c8 100644 --- a/src/Communication/Receivers.cxx +++ b/src/Communication/Receivers.cxx @@ -173,7 +173,6 @@ T *MPIReceiver::getDistValue(long &size){ MPI_Status status; MPI_Comm com; char port_name_clt [MPI_MAX_PORT_NAME]; - float telps, tuser, tsys, tcpu; T *_v; long _n; diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 3eefce56c..e3c97bdae 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -240,7 +240,7 @@ SALOME_MPISender_i::~SALOME_MPISender_i(){ SALOME::MPISender::param* SALOME_MPISender_i::getParam() { char stag[12]; - int myproc,i=0; + int i=0; SALOME::MPISender::param_var p = new SALOME::MPISender::param; MPI_Comm_rank(MPI_COMM_WORLD,&_cproc); @@ -315,7 +315,6 @@ void* SALOME_MPISender_i::myThread(void *args) void SALOME_MPISender_i::close(const SALOME::MPISender::param& p) { std::string service(p.service); - const char *st=p.service; void *r; _newThr->join(&r); MPI_Comm_free(&_com); diff --git a/src/MPIContainer/MPIContainer_i.cxx b/src/MPIContainer/MPIContainer_i.cxx index 627f398be..35437916d 100644 --- a/src/MPIContainer/MPIContainer_i.cxx +++ b/src/MPIContainer/MPIContainer_i.cxx @@ -381,8 +381,12 @@ Engines_MPIContainer_i::createMPIInstance(std::string genericRegisterName, _listInstances_map[instanceName] = iobject; _cntInstances_map[aGenRegisterName] += 1; //SCRUTE(servant->pd_refCount); +#ifndef _DEBUG_ + servant->setStudyId(studyId); +#else bool ret_studyId = servant->setStudyId(studyId); ASSERT(ret_studyId); +#endif // --- register the engine under the name // containerName(.dir)/instanceName(.object) diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx index 546dddac2..36d4b6540 100644 --- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx +++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.cxx @@ -83,8 +83,12 @@ public : // il est utilise puis detruit par la fonction Nettoyage //To be sure the trace singleton will be the last one to be destroyed initialize it here before calling atexit LocalTraceBufferPool::instance(); +#ifndef _DEBUG_ + atexit( Nettoyage ); // execute Nettoyage lors de exit, aprs la destruction des donnees statiques ! +#else int cr = atexit( Nettoyage ); // execute Nettoyage lors de exit, aprs la destruction des donnees statiques ! assert(cr==0) ; +#endif ATEXIT_Done = true ; } } -- 2.39.2