From bdd6176cbd180701e6bfb3ab93c0ec3a6bdd6ff8 Mon Sep 17 00:00:00 2001 From: rnv Date: Tue, 22 Nov 2011 11:04:29 +0000 Subject: [PATCH] Fix compilation warnings. --- src/Tools/padder/meshjob/impl/MeshJobManager_i.cxx | 3 +++ src/Tools/padder/meshjob/impl/SPADDERPluginTester_i.cxx | 4 ++++ 2 files changed, 7 insertions(+) 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 #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 #include "SALOME_Launcher.hxx" bool SPADDERPluginTester_i::testkernel() -- 2.39.2