CCAR: import_hook.py was too strict in ensure_list (ImportError raised)

[modules/kernel.git] / src / MPIContainer / MPIObject_i.hxx

diff --git a/src/MPIContainer/MPIObject_i.hxx b/src/MPIContainer/MPIObject_i.hxx
index 641cb113895059aabfa7356cae93d9b6b2d99030..a0076892912cb1fed94d968da1d5c88907c74c2a 100644 (file)
--- a/src/MPIContainer/MPIObject_i.hxx
+++ b/src/MPIContainer/MPIObject_i.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  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
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME MPIContainer : implemenation of container based on MPI libraries
 //  File   : MPIObject_i.hxx
 //  Module : SALOME
@@ -30,21 +31,11 @@
 #include <string>
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_MPIObject)
-#define defaultService "SERVER"
-
-class POException
-{
-public:
-  const std::string msg;
-  const int numproc;
-  POException(const int ip,const std::string m) : numproc(ip),msg(m) {}
-};
 
-class MPIObject_i: public POA_Engines::MPIObject
+class MPIObject_i: public virtual POA_Engines::MPIObject
 {
  public:
   MPIObject_i();
-  MPIObject_i(int nbproc, int numproc);
   ~MPIObject_i();
     
   Engines::IORTab* tior();
@@ -58,18 +49,21 @@ class MPIObject_i: public POA_Engines::MPIObject
   // IOR des objets paralleles sur tous les process mpi
   Engines::IORTab* _tior;
   // Echange des IOR de l'objet entre process
-  void BCastIOR(CORBA::ORB_ptr orb,Engines::MPIObject_ptr pobj,bool amiCont) throw(POException);
+  void BCastIOR(CORBA::ORB_ptr orb,Engines::MPIObject_ptr pobj,bool amiCont);
 #ifdef HAVE_MPI2
   // MPI2 connection
-  MPI_Comm remoteMPI2Connect(std::string service=defaultService) throw(POException);
+  void remoteMPI2Connect(std::string service);
   // MPI2 disconnection
-  void remoteMPI2Disconnect(MPI_Comm gcom);
+  void remoteMPI2Disconnect(std::string service);
 #endif
 
+protected:
+  std::map<std::string, MPI_Comm> _gcom;
+
 private:
-  int _srv;
-  char _port_name[MPI_MAX_PORT_NAME];
-  std::string _service;
+  std::map<std::string, MPI_Comm> _icom;
+  std::map<std::string, bool> _srv;
+  std::map<std::string, std::string> _port_name;
 
 } ;