From c777f8e35acbf1db1d1ab2223ec07bf815741f37 Mon Sep 17 00:00:00 2001 From: Anthony GEAY Date: Fri, 19 Feb 2021 17:10:08 +0100 Subject: [PATCH] OK for session_i --- .../SALOME_Fake_NamingService.cxx | 19 +++++++++++++++++++ .../SALOME_Fake_NamingService.hxx | 5 +++++ src/NamingService/SALOME_NamingService.hxx | 8 ++++---- .../SALOME_NamingService_Abstract.hxx | 7 +++++++ 4 files changed, 35 insertions(+), 4 deletions(-) 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 SALOME_Fake_NamingService::list_subdirs() +{ + return std::vector(); +} + +std::vector SALOME_Fake_NamingService::list_directory() +{ + return std::vector(); +} + 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 list_subdirs() override; + std::vector list_directory() override; private: static std::mutex _mutex; static std::map _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 list_directory() ; - std::vector list_subdirs() ; + std::vector list_directory() override; + std::vector list_subdirs() override; std::vector 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 +#include + 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 list_subdirs() = 0; + virtual std::vector list_directory() = 0; virtual ~SALOME_NamingService_Abstract() { } }; -- 2.39.2