From 9bdb0c0e384bdcfe5b985f1c9af12eefe16b1490 Mon Sep 17 00:00:00 2001 From: adam Date: Tue, 23 Mar 2010 15:11:13 +0000 Subject: [PATCH] remove warnings --- src/OBJECT/SALOME_InteractiveObject.hxx | 3 ++ src/SUITApp/SUITApp.cxx | 46 ++++++++++++------------- src/Session/SALOME_Session_Server.cxx | 2 +- src/Session/Session_ServerThread.cxx | 5 ++- 4 files changed, 29 insertions(+), 27 deletions(-) diff --git a/src/OBJECT/SALOME_InteractiveObject.hxx b/src/OBJECT/SALOME_InteractiveObject.hxx index ed938b853..5abe2100a 100755 --- a/src/OBJECT/SALOME_InteractiveObject.hxx +++ b/src/OBJECT/SALOME_InteractiveObject.hxx @@ -35,6 +35,9 @@ #ifdef VERSION #undef VERSION #endif +#ifdef HAVE_FINITE +#undef HAVE_FINITE +#endif #include #endif #ifndef _Handle_SALOME_InteractiveObject_HeaderFile diff --git a/src/SUITApp/SUITApp.cxx b/src/SUITApp/SUITApp.cxx index 604eff9c5..55c744878 100644 --- a/src/SUITApp/SUITApp.cxx +++ b/src/SUITApp/SUITApp.cxx @@ -93,29 +93,29 @@ static QString salomeVersion() return ver; } -static void MessageOutput( QtMsgType type, const char* msg ) -{ - switch ( type ) - { - case QtDebugMsg: -#ifdef _DEBUG_ - printf( "Debug: %s\n", msg ); -#endif - break; - case QtWarningMsg: -#ifdef _DEBUG_ - printf( "Warning: %s\n", msg ); -#endif - break; - case QtFatalMsg: -#ifdef _DEBUG_ - printf( "Fatal: %s\n", msg ); -#endif - break; - default: - break; - } -} +// static void MessageOutput( QtMsgType type, const char* msg ) +// { +// switch ( type ) +// { +// case QtDebugMsg: +// #ifdef _DEBUG_ +// printf( "Debug: %s\n", msg ); +// #endif +// break; +// case QtWarningMsg: +// #ifdef _DEBUG_ +// printf( "Warning: %s\n", msg ); +// #endif +// break; +// case QtFatalMsg: +// #ifdef _DEBUG_ +// printf( "Fatal: %s\n", msg ); +// #endif +// break; +// default: +// break; +// } +// } /* XPM */ static const char* pixmap_not_found_xpm[] = { diff --git a/src/Session/SALOME_Session_Server.cxx b/src/Session/SALOME_Session_Server.cxx index b9fdb1525..5d42b4661 100755 --- a/src/Session/SALOME_Session_Server.cxx +++ b/src/Session/SALOME_Session_Server.cxx @@ -597,7 +597,7 @@ int main( int argc, char **argv ) // std::cerr << "Caught unexpected exception on destroy : ignored !!" << std::endl; } - PyGILState_STATE gstate = PyGILState_Ensure(); + PyGILState_Ensure(); //Destroy orb from python (for chasing memory leaks) //PyRun_SimpleString("from omniORB import CORBA"); //PyRun_SimpleString("orb=CORBA.ORB_init([''], CORBA.ORB_ID)"); diff --git a/src/Session/Session_ServerThread.cxx b/src/Session/Session_ServerThread.cxx index 83f6c2de8..39e33ba9d 100755 --- a/src/Session/Session_ServerThread.cxx +++ b/src/Session/Session_ServerThread.cxx @@ -297,7 +297,7 @@ void Session_ServerThread::ActivateContainerManager(int argc, try { PortableServer::POA_var root_poa=PortableServer::POA::_the_root_poa(); cout << "Activate SalomeLauncher ......!!!! " << endl; - SALOME_Launcher * myContainer = new SALOME_Launcher(_orb,root_poa); + new SALOME_Launcher(_orb,root_poa); } catch(CORBA::SystemException&) { INFOS("Caught CORBA::SystemException."); @@ -370,8 +370,7 @@ void Session_ServerThread::ActivateContainer(int argc, containerName = argv[1]; } - Engines_Container_i * myContainer - = new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false); + new Engines_Container_i(_orb, _root_poa, containerName , argc , argv , true , false); } catch(CORBA::SystemException&) { INFOS("Caught CORBA::SystemException."); -- 2.39.2