[EDF29093] : Quick fix resorbed

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

diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index d6a53c28e2e6c138bd5421d827ec1292e03192df..fd9d3607c3a8c4a47153258f94657801bbb5c564 100644 (file)
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2023  CEA, EDF, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -35,50 +35,47 @@
 
 #include <vector>
 #include <string>
-#include "utilities.h"
 #include "Utils_Mutex.hxx"
 #include "ServiceUnreachable.hxx"
 
-#include "SALOME_NamingService_defs.hxx"
+#include "SALOME_NamingService_Abstract.hxx"
 
 #ifdef WIN32
-#pragma warning(disable:4290) // Warning Exception ...
+//#pragma warning(disable:4290) // Warning Exception ...
 #endif
 
-class NAMINGSERVICE_EXPORT SALOME_NamingService
+class NAMINGSERVICE_EXPORT SALOME_NamingService : public SALOME_NamingService_Abstract
 {
 public:
   SALOME_NamingService();
   SALOME_NamingService(CORBA::ORB_ptr orb);
 
   virtual ~SALOME_NamingService();
-
-  void init_orb(CORBA::ORB_ptr orb=0);
-  void Register(CORBA::Object_ptr ObjRef, const char* Path) throw(ServiceUnreachable);
-  CORBA::Object_ptr Resolve(const char* Path) throw( ServiceUnreachable); 
-  CORBA::Object_ptr ResolveFirst(const char* Path) throw( ServiceUnreachable); 
+  bool IsTrueNS() const override { return true; }
+  std::vector< std::string > repr() override;
+  void init_orb(CORBA::ORB_ptr orb=0) override;
+  void Register(CORBA::Object_ptr ObjRef, const char* Path) override;
+  CORBA::Object_ptr Resolve(const char* Path) override; 
+  CORBA::Object_ptr ResolveFirst(const char* Path) ; 
   CORBA::Object_ptr ResolveComponent(const char* hostname,
                                      const char* containerName,
                                      const char* componentName,
-                                     const int nbproc=0) throw(ServiceUnreachable);
-  std::string ContainerName(const char *ContainerName);
-  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);
+                                     const int nbproc=0) override;
 
-  int Find(const char* name) throw(ServiceUnreachable);
-  bool Create_Directory(const char* Path) throw(ServiceUnreachable);
-  bool Change_Directory(const char* Path) throw(ServiceUnreachable);
-  char* Current_Directory() throw(ServiceUnreachable);
-  void list() throw(ServiceUnreachable);
-  std::vector<std::string> list_directory() throw(ServiceUnreachable);
-  std::vector<std::string> list_subdirs() throw(ServiceUnreachable);
-  std::vector<std::string> list_directory_recurs() throw(ServiceUnreachable);
-  void Destroy_Name(const char* Path) throw(ServiceUnreachable);
-  virtual void Destroy_Directory(const char* Path) throw(ServiceUnreachable);
-  virtual void Destroy_FullDirectory(const char* Path) throw(ServiceUnreachable);
+  int Find(const char* name) ;
+  bool Create_Directory(const char* Path) ;
+  bool Change_Directory(const char* Path) override;
+  char* Current_Directory() ;
+  void list() ;
+  std::vector<std::string> list_directory() override;
+  std::vector<std::string> list_subdirs() override;
+  std::vector<std::string> list_directory_recurs() override ;
+  void Destroy_Name(const char* Path) override;
+  void Destroy_Directory(const char* Path) override;
+  void Destroy_FullDirectory(const char* Path) override;
   char *getIORaddr();
   CORBA::ORB_ptr orb();
+  SALOME_NamingService_Abstract *clone() override;
 
 protected:
   Utils_Mutex _myMutex;