- Major update for launcher:

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

diff --git a/src/ResourcesManager/ResourcesManager.hxx b/src/ResourcesManager/ResourcesManager.hxx
index c5ce0f2c896de5257d37c4ec77f0662fd0aa3d7b..fa8261e1a606b6f3e580602539e9c35b4a289ce1 100644 (file)
--- a/src/ResourcesManager/ResourcesManager.hxx
+++ b/src/ResourcesManager/ResourcesManager.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -19,6 +19,7 @@
 //
 //  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
+
 #ifndef __RESOURCESMANAGER_HXX__
 #define __RESOURCESMANAGER_HXX__
 
@@ -38,6 +39,11 @@
 #include <unistd.h>
 #endif
 
+#ifdef WNT
+#pragma warning(disable:4251) // Warning DLL Interface ...
+#pragma warning(disable:4290) // Warning Exception ...
+#endif
+
 // --- WARNING ---
 // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done
 // in a critical section to be sure to be clean.
@@ -79,18 +85,13 @@ class RESOURCESMANAGER_EXPORT ResourcesManager_cpp
     GetFittingResources(const resourceParams& params) throw(ResourcesException);
 
     std::string Find(const std::string& policy, 
-                    const std::vector<std::string>& listOfResources);
+                     const std::vector<std::string>& listOfResources);
 
-    int AddResourceInCatalog (const resourceParams& paramsOfNewResources,
-                             const std::vector<std::string>& componentsOnNewResources,
-                             const char *userName,
-                             AccessModeType mode,
-                             AccessProtocolType prot,
-                             AccessProtocolType iprot) throw(ResourcesException);
+    void AddResourceInCatalog (const ParserResourcesType & new_resource) throw(ResourcesException);
 
     void DeleteResourceInCatalog(const char * name);
 
-    void WriteInXmlFile(std::string & xml_file);
+    void WriteInXmlFile(std::string xml_file);
 
     const MapOfParserResourcesType& ParseXmlFiles();
 
@@ -103,7 +104,7 @@ class RESOURCESMANAGER_EXPORT ResourcesManager_cpp
     void SelectOnlyResourcesWithOS(std::vector<std::string>& resources, std::string OS);
 
     void KeepOnlyResourcesWithComponent(std::vector<std::string>& resources, 
-                                       const std::vector<std::string>& componentList);
+                                        const std::vector<std::string>& componentList);
 
     //! will contain the path to the ressources catalog
     std::list<std::string> _path_resources;