updated copyright message

[modules/kernel.git] / src / ResourcesManager / SALOME_ResourcesManager.hxx

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index d01ff4a8a146d3f0ff6636bb3dc6d9ede603311f..1d2d5d0ff12fcfa070334d005ddd948c819c6155 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2016  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
@@ -26,11 +26,12 @@
 #include "Utils_SALOME_Exception.hxx"
 #include "utilities.h"
 #include <SALOMEconfig.h>
-#include "SALOME_NamingService.hxx"
+#include "SALOME_NamingService_Abstract.hxx"
 #include CORBA_CLIENT_HEADER(SALOME_ContainerManager)
 #include <string>
 #include <fstream>
 #include <vector>
+#include <memory>
 #include "ResourcesManager.hxx"
 
 #include "SALOME_ResourcesManager_Common.hxx"
@@ -52,8 +53,8 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
 
   public:
 
-    SALOME_ResourcesManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService *ns, const char *xmlFilePath);
-    SALOME_ResourcesManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService *ns);
+    SALOME_ResourcesManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService_Abstract *ns, const char *xmlFilePath);
+    SALOME_ResourcesManager(CORBA::ORB_ptr orb, PortableServer::POA_var poa, SALOME_NamingService_Abstract *ns);
 
     ~SALOME_ResourcesManager();
 
@@ -73,18 +74,20 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
                          CORBA::Long nb_procs,
                          const char * parallelLib);
     void ListAllAvailableResources(Engines::ResourceList_out machines, Engines::IntegerList_out nbProcsOfMachines);
+    
+    Engines::ResourceList *ListAllResourcesInCatalog();
     // Cpp Methods
     void Shutdown();
-    ResourcesManager_cpp *GetImpl() { return &_rm; }
+    std::shared_ptr<ResourcesManager_cpp>& GetImpl() { return _rm; }
 
 
     static const char *_ResourcesManagerNameInNS;
   protected:
 
-    SALOME_NamingService *_NS;
+    SALOME_NamingService_Abstract *_NS;
     CORBA::ORB_var _orb;
     PortableServer::POA_var _poa;
-    ResourcesManager_cpp _rm;
+    std::shared_ptr<ResourcesManager_cpp> _rm;
   };
 
 #endif // RESSOURCESCATALOG_IMPL_H