From: rnv <rnv@opencascade.com>
Date: Tue, 22 Nov 2011 11:04:29 +0000 (+0000)
Subject: Fix compilation warnings.
X-Git-Tag: V6_4_0rc1~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=bdd6176cbd180701e6bfb3ab93c0ec3a6bdd6ff8;p=modules%2Fsmesh.git

Fix compilation warnings.
---

diff --git a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
index b35007cf4..beb25fdec 100644
--- a/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
+++ b/src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx
@@ -29,9 +29,12 @@
 #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
 
 //
diff --git a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx
index ae4f8cd32..3bfa98bb6 100644
--- a/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx
+++ b/src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx
@@ -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()