From: Anthony GEAY <anthony.geay@edf.fr>
Date: Fri, 19 Feb 2021 16:10:08 +0000 (+0100)
Subject: OK for session_i
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c777f8e35acbf1db1d1ab2223ec07bf815741f37;p=modules%2Fkernel.git

OK for session_i
---

diff --git a/src/NamingService/SALOME_Fake_NamingService.cxx b/src/NamingService/SALOME_Fake_NamingService.cxx
index 7babdc7bf..a9674e45b 100644
--- a/src/NamingService/SALOME_Fake_NamingService.cxx
+++ b/src/NamingService/SALOME_Fake_NamingService.cxx
@@ -38,6 +38,25 @@ void SALOME_Fake_NamingService::Destroy_Name(const char* Path)
 {
 }
 
+void SALOME_Fake_NamingService::Destroy_Directory(const char* Path)
+{
+}
+
+bool SALOME_Fake_NamingService::Change_Directory(const char* Path)
+{
+  return true;
+}
+
+std::vector<std::string> SALOME_Fake_NamingService::list_subdirs()
+{
+  return std::vector<std::string>();
+}
+
+std::vector<std::string> SALOME_Fake_NamingService::list_directory()
+{
+  return std::vector<std::string>();
+}
+
 CORBA::Object_ptr SALOME_Fake_NamingService::Resolve(const char* Path)
 {
   std::string pathCpp(Path);
diff --git a/src/NamingService/SALOME_Fake_NamingService.hxx b/src/NamingService/SALOME_Fake_NamingService.hxx
index 6393b2042..b6de9001a 100644
--- a/src/NamingService/SALOME_Fake_NamingService.hxx
+++ b/src/NamingService/SALOME_Fake_NamingService.hxx
@@ -31,9 +31,14 @@ class NAMINGSERVICE_EXPORT SALOME_Fake_NamingService : public SALOME_NamingServi
 {
 public:
     SALOME_Fake_NamingService(CORBA::ORB_ptr orb);
+    SALOME_Fake_NamingService() = default;
     void Register(CORBA::Object_ptr ObjRef, const char* Path) override;
     CORBA::Object_ptr Resolve(const char* Path) override;
     void Destroy_Name(const char* Path) override;
+    void Destroy_Directory(const char* Path) override;
+    bool Change_Directory(const char* Path) override;
+    std::vector<std::string> list_subdirs() override;
+    std::vector<std::string> list_directory() override;
 private:
     static std::mutex _mutex;
     static std::map<std::string,CORBA::Object_var> _map;
diff --git a/src/NamingService/SALOME_NamingService.hxx b/src/NamingService/SALOME_NamingService.hxx
index d7bc3cd00..3b24fc168 100644
--- a/src/NamingService/SALOME_NamingService.hxx
+++ b/src/NamingService/SALOME_NamingService.hxx
@@ -69,14 +69,14 @@ public:
 
   int Find(const char* name) ;
   bool Create_Directory(const char* Path) ;
-  bool Change_Directory(const char* Path) ;
+  bool Change_Directory(const char* Path) override;
   char* Current_Directory() ;
   void list() ;
-  std::vector<std::string> list_directory() ;
-  std::vector<std::string> list_subdirs() ;
+  std::vector<std::string> list_directory() override;
+  std::vector<std::string> list_subdirs() override;
   std::vector<std::string> list_directory_recurs() ;
   void Destroy_Name(const char* Path) override;
-  virtual void Destroy_Directory(const char* Path) ;
+  virtual void Destroy_Directory(const char* Path) override;
   virtual void Destroy_FullDirectory(const char* Path) ;
   char *getIORaddr();
   CORBA::ORB_ptr orb();
diff --git a/src/NamingService/SALOME_NamingService_Abstract.hxx b/src/NamingService/SALOME_NamingService_Abstract.hxx
index ea6b37305..979a7780a 100644
--- a/src/NamingService/SALOME_NamingService_Abstract.hxx
+++ b/src/NamingService/SALOME_NamingService_Abstract.hxx
@@ -23,11 +23,18 @@
 
 #include "omniORB4/CORBA.h"
 
+#include <vector>
+#include <string>
+
 class NAMINGSERVICE_EXPORT SALOME_NamingService_Abstract
 {
 public:
   virtual void Register(CORBA::Object_ptr ObjRef, const char* Path) = 0;
   virtual CORBA::Object_ptr Resolve(const char* Path) = 0;
   virtual void Destroy_Name(const char* Path) = 0;
+  virtual void Destroy_Directory(const char* Path) = 0;
+  virtual bool Change_Directory(const char* Path) = 0;
+  virtual std::vector<std::string> list_subdirs() = 0;
+  virtual std::vector<std::string> list_directory() = 0;
   virtual ~SALOME_NamingService_Abstract() { }
 };