Merge from V5_1_3_BR 07/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 daa5ca63691566a4e00b540e507ec2dc1c02a759..df06b2e1c8317a4ae93fa0a19b2aeae82b60aa40 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);
@@ -91,10 +91,11 @@ public:
   virtual void Destroy_FullDirectory(const char* Path)
     throw(ServiceUnreachable);
   char* getIORaddr();
+  CORBA::ORB_ptr orb();
 
 protected:
   Utils_Mutex _myMutex;
-  CORBA::ORB_ptr _orb;
+  CORBA::ORB_var _orb;
   CosNaming::NamingContext_var _root_context, _current_context;
 
   void _initialize_root_context();