Increment version: 7.6.0

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

diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx
index 619a1e705da39e4ddf9c70c42777831dcb772f0b..e24a0fbcf9c5f905be80accd5aff478463adf1ae 100644 (file)
--- a/src/ResourcesManager/SALOME_ResourcesManager.hxx
+++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2015  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
@@ -6,7 +6,7 @@
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -33,18 +33,9 @@
 #include <vector>
 #include "ResourcesManager.hxx"
 
+#include "SALOME_ResourcesManager_Common.hxx"
 
 #ifdef WIN32
-# if defined SALOMERESOURCESMANAGER_EXPORTS || defined SalomeResourcesManager_EXPORTS
-#  define SALOMERESOURCESMANAGER_EXPORT __declspec( dllexport )
-# else
-#  define SALOMERESOURCESMANAGER_EXPORT __declspec( dllimport )
-# endif
-#else
-# define SALOMERESOURCESMANAGER_EXPORT
-#endif
-
-#ifdef WNT
 #pragma warning(disable:4275) // Disable warning interface non dll
 #endif
 
@@ -78,13 +69,13 @@ class SALOMERESOURCESMANAGER_EXPORT SALOME_ResourcesManager:
     void RemoveResource(const char * resource_name,
                         CORBA::Boolean write,
                         const char * xml_file);
+    char* getMachineFile(const char * resource_name,
+                         CORBA::Long nb_procs,
+                         const char * parallelLib);
 
     // Cpp Methods
     void Shutdown();
     ResourcesManager_cpp *GetImpl() { return &_rm; }
-    std::string getMachineFile(std::string resource_name, 
-                               CORBA::Long nb_procs,
-                               std::string parallelLib);
 
 
     static const char *_ResourcesManagerNameInNS;