0023366: [CEA 1972] Porting Salome to GCC 6

[modules/kernel.git] / src / Container / Container_i.cxx

diff --git a/src/Container/Container_i.cxx b/src/Container/Container_i.cxx
index e18381210093125254361e4728feec0610556464..68373b289881b5a0bda0e0992352d05987b99b5a 100644 (file)
--- a/src/Container/Container_i.cxx
+++ b/src/Container/Container_i.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -993,10 +993,11 @@ Engines_Container_i::create_python_service_instance(const char * CompName,
   const char *error;
   PyArg_ParseTuple(result,"ss", &ior, &error);
   reason = CORBA::string_dup(error);
+  char * _ior = CORBA::string_dup(ior);
   Py_DECREF(result);
   PyGILState_Release(gstate);
 
-  return CORBA::string_dup(ior);
+  return _ior;
 }
 
 
@@ -1048,10 +1049,10 @@ Engines_Container_i::createInstance(std::string genericRegisterName,
 
   if ( !Component_factory )
   {
-    INFOS( "Can't resolve symbol: " + factory_name );
+    MESSAGE( "Can't resolve symbol: " + factory_name );
 #ifndef WIN32
     reason=dlerror();
-    INFOS(reason);
+    MESSAGE(reason);
 #endif
     return Engines::EngineComponent::_nil() ;
   }
@@ -1637,10 +1638,10 @@ void Engines_Container_i::copyFile(Engines::Container_ptr container, const char*
       while (toFollow)
         {
           ctr++;
-          SCRUTE(ctr);
+          //SCRUTE(ctr);
           aBlock = fileTransfer->getBlock(fileId);
           toFollow = aBlock->length();
-          SCRUTE(toFollow);
+          //SCRUTE(toFollow);
           CORBA::Octet *buf = aBlock->get_buffer();
           fwrite(buf, sizeof(CORBA::Octet), toFollow, fp);
           delete aBlock;