Salome HOME
Fix compilation warnings.
authorrnv <rnv@opencascade.com>
Tue, 22 Nov 2011 11:04:29 +0000 (11:04 +0000)
committerrnv <rnv@opencascade.com>
Tue, 22 Nov 2011 11:04:29 +0000 (11:04 +0000)
src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx

index b35007cf4176bbf3dbb1f70ad88e99f2bb750e23..beb25fdece1b6aa610b7cdc8e6279d4df49e4200 100644 (file)
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
+
 #include "Basics_Utils.hxx"         // For standard logging
+#undef LOG
 #include "SALOME_KernelServices.hxx"   // For CORBA logging
 #undef LOG
+
 #define LOG STDLOG
 
 //
index ae4f8cd3288da758262458137cd7366594d3774b..3bfa98bb633e5ba0a11da2668c6c53853fd2305d 100644 (file)
@@ -86,6 +86,10 @@ void SPADDERPluginTester_i::demo(CORBA::Double a,CORBA::Double b,CORBA::Double&
   endService("SPADDERPluginTester_i::demo");
 }
 
+#ifdef LOG
+#undef LOG
+#endif
+
 #include <SALOME_KernelServices.hxx>
 #include "SALOME_Launcher.hxx"
 bool SPADDERPluginTester_i::testkernel()