Windows compatibility

diff --git a/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx b/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx
index 1147ba66586834e89fd05e10d293e10a2ccf7246..a8b740c929d31fceaea2d728fc2efc8be4cd259a 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx
+++ b/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx
@@ -27,6 +27,7 @@
 #include "SALOMESDS_RefCountServ.hxx"
 #include "SALOMESDS_AutoRefCountPtr.hxx"
 #include "SALOMESDS_BasicDataServer.hxx"
+#include "SALOMESDS_Defines.hxx"
 
 #include <Python.h>
 
@@ -36,7 +37,7 @@
 
 namespace SALOMESDS
 {
-  class DataScopeServer : public virtual POA_SALOME::DataScopeServer
+  class SALOMESDS_EXPORT DataScopeServer : public virtual POA_SALOME::DataScopeServer
   {
   public:
     DataScopeServer(CORBA::ORB_ptr orb, const std::string& scopeName);

diff --git a/src/SALOMESDS/SALOMESDS_DataServerManager.hxx b/src/SALOMESDS/SALOMESDS_DataServerManager.hxx
index cf835c486a8aa95ace516cbbc311d5c2c9e23a38..b4cbfba7e0ee84c297b6689fa45296ef467406e1 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_DataServerManager.hxx
+++ b/src/SALOMESDS/SALOMESDS_DataServerManager.hxx
@@ -27,13 +27,15 @@
 #include "SALOMESDS_AutoRefCountPtr.hxx"
 #include "SALOMESDS_DataScopeServer.hxx"
 
+#include "SALOMESDS_Defines.hxx"
+
 #include <string>
 
 namespace SALOMESDS
 {
   class DataScopeServer;
   
-  class DataServerManager : public virtual POA_SALOME::DataServerManager
+  class SALOMESDS_EXPORT DataServerManager : public virtual POA_SALOME::DataServerManager
   {
   public:
     DataServerManager(int argc, char *argv[], CORBA::ORB_ptr orb, PortableServer::POA_ptr poa);

diff --git a/src/SALOMESDS/SALOMESDS_Defines.hxx b/src/SALOMESDS/SALOMESDS_Defines.hxx
new file mode 100644 (file)
index 0000000..1a464d6
--- /dev/null
+++ b/src/SALOMESDS/SALOMESDS_Defines.hxx
@@ -0,0 +1,33 @@
+// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+//
+// 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, 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
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
+
+#ifndef _SALOMESDS_Defines_HXX_
+#define _SALOMESDS_Defines_HXX_
+
+#ifdef WIN32
+# if defined SALOMESDS_EXPORTS || defined SalomeSDS_EXPORTS
+#  define SALOMESDS_EXPORT __declspec( dllexport )
+# else
+#  define SALOMESDS_EXPORT __declspec( dllimport )
+# endif
+#else
+# define SALOMESDS_EXPORT
+#endif
+
+#endif

diff --git a/src/SALOMESDS/SALOMESDS_Exception.hxx b/src/SALOMESDS/SALOMESDS_Exception.hxx
index c5943ae8a0c00922c81cfaacde465b63bf3c7c5c..833a08d1adb0ea475b34d09c1fa62e22e89683f7 100644 (file)
--- a/src/SALOMESDS/SALOMESDS_Exception.hxx
+++ b/src/SALOMESDS/SALOMESDS_Exception.hxx
@@ -24,11 +24,13 @@
 #include "SALOMEconfig.h"
 #include CORBA_SERVER_HEADER(SALOME_Exception)
 
+#include "SALOMESDS_Defines.hxx"
+
 #include <string>
 
 namespace SALOMESDS
 {
-  class Exception : public SALOME::SALOME_Exception
+  class SALOMESDS_EXPORT Exception : public SALOME::SALOME_Exception
   {
   public:
     Exception(const std::string& reason);