Issue 0020349: compatibility python 2.6 in import_hook

[modules/kernel.git] / src / TestMPIContainer / TestMPIContainer.cxx

diff --git a/src/TestMPIContainer/TestMPIContainer.cxx b/src/TestMPIContainer/TestMPIContainer.cxx
index 8980074879dea70df07bec5e4d0b4c6f88d91c97..e3e8c27e43a5d6727439ab2bd7e66e19ecb379a7 100644 (file)
--- a/src/TestMPIContainer/TestMPIContainer.cxx
+++ b/src/TestMPIContainer/TestMPIContainer.cxx
@@ -1,13 +1,33 @@
+//  Copyright (C) 2007-2008  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
+//
+//  This library is free software; you can redistribute it and/or
+//  modify it under the terms of the GNU Lesser General Public
+//  License as published by the Free Software Foundation; either
+//  version 2.1 of the License.
+//
+//  This library is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+//  Lesser General Public License for more details.
+//
+//  You should have received a copy of the GNU Lesser General Public
+//  License along with this library; if not, write to the Free Software
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+//  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
 // using namespace std;
 //=============================================================================
 // File      : TestMPIContainer.cxx
 // Created   : mer jui 4 13:11:27 CEST 2003
 // Author    : Bernard SECHER, 2003
 // Project   : SALOME
-// Copyright : CEA 2003
 // $Header$
 //=============================================================================
-
+//
 #include "utilities.h"
 #include <iostream>
 #include <unistd.h>
@@ -16,11 +36,11 @@
 #include CORBA_CLIENT_HEADER(SALOME_MPIContainer)
 #include CORBA_CLIENT_HEADER(SALOME_TestMPIComponent)
 
+#include "Basics_Utils.hxx"
 # include "Utils_ORB_INIT.hxx"
 # include "Utils_SINGLETON.hxx"
 #include "SALOME_NamingService.hxx"
 #include "OpUtil.hxx"
-#include "LocalTraceCollector.hxx"
 using namespace std;
 
 int main (int argc, char * argv[])
@@ -29,7 +49,7 @@ int main (int argc, char * argv[])
   // Initializing omniORB
   ORB_INIT &init = *SINGLETON_<ORB_INIT>::Instance() ;
   CORBA::ORB_var &orb = init( argc , argv ) ;
-  LocalTraceCollector *myThreadTrace = LocalTraceCollector::instance(orb);
+  //  SALOMETraceCollector *myThreadTrace = SALOMETraceCollector::instance(orb);
     
   BEGIN_OF(argv[0])
   try{
@@ -48,7 +68,7 @@ int main (int argc, char * argv[])
     // Use Name Service to find container
     SALOME_NamingService NS(orb) ;
     string containerName = "/Containers/" ;
-    string hostName = GetHostname();
+    string hostName = Kernel_Utils::GetHostname();
     containerName += hostName + "/MPIFactoryServer_" + argv[2];
 
     string dirn(getenv("KERNEL_ROOT_DIR"));
@@ -115,7 +135,7 @@ int main (int argc, char * argv[])
 //     // Clean-up.
 // //     iGenFact->finalize_removal() ;
 // //     sleep(5);
-    iGenFact->MPIShutdown();
+    iGenFact->Shutdown();
 //     INFOS("shut down corba server for Test MPI Container");
 //     orb->destroy();
   }
@@ -133,6 +153,6 @@ int main (int argc, char * argv[])
   }
 
   END_OF(argv[0]);
-  delete myThreadTrace;
+  //  delete myThreadTrace;
   return 0 ;
 }