0021165: [CEA] Unit test crashes salome session

[modules/kernel.git] / src / ParallelContainer / SALOME_ParallelContainerProxy_i.hxx

diff --git a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx b/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx
index 6e4c56db47274168ef1ebe4890fb7febacae3a33..4be850dfd5866fe37bbabd986467e136550dbe47 100644 (file)
--- a/src/ParallelContainer/SALOME_ParallelContainerProxy_i.hxx
+++ b/src/ParallelContainer/SALOME_ParallelContainerProxy_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,10 +19,11 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 //  SALOME_ParallelContainerProxy : implementation of container and engine for Parallel Kernel
 //  File   : SALOME_ParallelContainerProxy_i.hxx
 //  Author : André RIBES, EDF
-
+//
 #ifndef _SALOME_PARALLEL_CONTAINER_PROXY_I_HXX_
 #define _SALOME_PARALLEL_CONTAINER_PROXY_I_HXX_
 
@@ -45,17 +46,21 @@ class Container_proxy_impl_final :
 {
   public:
     Container_proxy_impl_final(CORBA::ORB_ptr orb, 
-                              paco_fabrique_thread * fab_thread,
-                              PortableServer::POA_ptr poa,
-                              std::string containerName,
-                              bool is_a_return_proxy = false);
+                               paco_fabrique_thread * fab_thread,
+                               PortableServer::POA_ptr poa,
+                               std::string containerName,
+                               bool is_a_return_proxy = false);
 
     virtual ~Container_proxy_impl_final();
 
     virtual void Shutdown();
 
-    virtual ::CORBA::Boolean load_component_Library(const char* componentName);
+    virtual ::CORBA::Boolean load_component_Library(const char* componentName,CORBA::String_out reason);
     virtual Engines::Component_ptr create_component_instance(const char* componentName, ::CORBA::Long studyId);
+    virtual Engines::Component_ptr create_component_instance_env( const char* componentName,
+                                                                  CORBA::Long studyId,          // 0 for multiStudy
+                                                                  const Engines::FieldsDict& env,
+                                                                  CORBA::String_out reason);
 
   private:
     std::map<std::string, std::string> _libtype_map; // libname -> libtype (seq ou par)
@@ -64,7 +69,7 @@ class Container_proxy_impl_final :
     {
       Engines::Component_var     proxy_corba_ref;
       PortableServer::ObjectId * proxy_id;
-      RegistryConnexion *       proxy_regist;
+      RegistryConnexion *        proxy_regist;
     };
 
     // Cette liste contient les references vers les différentes
@@ -75,12 +80,12 @@ class Container_proxy_impl_final :
     // parallèles ou sequentiels
     typedef void (*PACO_TEST_FUNCTION) ();
     typedef PortableServer::ObjectId * (*FACTORY_FUNCTION) (CORBA::ORB_ptr,
-                                                           paco_fabrique_thread *,
-                                                           PortableServer::POA_ptr,
-                                                           PortableServer::ObjectId *,
-                                                           RegistryConnexion **,
-                                                           const char *,
-                                                           int);
+                                                            paco_fabrique_thread *,
+                                                            PortableServer::POA_ptr,
+                                                            PortableServer::ObjectId *,
+                                                            RegistryConnexion **,
+                                                            const char *,
+                                                            int);
     int _numInstance;
     std::string _hostname;
     std::string _containerName;