merge from branch BR_V511_PR 15 12 2009

[modules/kernel.git] / src / NamingService / SALOME_NamingService.hxx

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index 6e54c5f7dc9db0fc91763649c69a33f4c569fb82..cadc0530b10e029b0da380a53459a8da1bbfc0cc 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -48,7 +48,7 @@ public:
 
   virtual ~SALOME_NamingService();
 
-  void init_orb(CORBA::ORB_ptr orb);
+  void init_orb(CORBA::ORB_ptr orb=0);
   void Register(CORBA::Object_ptr ObjRef,
                const char* Path) 
     throw(ServiceUnreachable);
@@ -62,10 +62,16 @@ public:
                                     const int nbproc=0)
     throw(ServiceUnreachable);
   std::string ContainerName(const char *ContainerName);
-  std::string ContainerName(const Engines::MachineParameters& params);
+  std::string ContainerName(const Engines::ContainerParameters& params);
   std::string BuildContainerNameForNS(const char *ContainerName,
                                      const char *hostname);
   std::string 
+  BuildContainerNameForNS(const Engines::ContainerParameters& params,
+                         const char *hostname);
+
+  // Will Be deleted on SALOME 6
+  std::string ContainerName(const Engines::MachineParameters& params);
+  std::string 
   BuildContainerNameForNS(const Engines::MachineParameters& params,
                          const char *hostname);
   int Find(const char* name)
@@ -91,6 +97,7 @@ public:
   virtual void Destroy_FullDirectory(const char* Path)
     throw(ServiceUnreachable);
   char* getIORaddr();
+  CORBA::ORB_ptr orb();
 
 protected:
   Utils_Mutex _myMutex;