Modification for Win32 platform

diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.hxx b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
index 185b77aee74bbf274762ee0b94273232e26dbe8a..e3475f2430e6653c091f2a975422dd2280762075 100644 (file)
--- a/src/DSC/DSC_Basic/ConnectionManager_i.hxx
+++ b/src/DSC/DSC_Basic/ConnectionManager_i.hxx
@@ -26,6 +26,8 @@
 #ifndef _CONNECTION_MANAGER_I_HXX_
 #define _CONNECTION_MANAGER_I_HXX_
 
+#include <DSC_Basic.hxx>
+
 #include <iostream>
 #include <map>
 #include <pthread.h>
@@ -36,7 +38,7 @@
 /*! \class ConnectionManager_i
  *  \brief This class implements the interface Engines::ConnectionManager.
  */
-class ConnectionManager_i :
+class DSC_BASIC_EXPORT ConnectionManager_i :
   public virtual POA_Engines::ConnectionManager
 {
   public :

diff --git a/src/DSC/DSC_Basic/DSC_Basic.hxx b/src/DSC/DSC_Basic/DSC_Basic.hxx
new file mode 100755 (executable)
index 0000000..0c94e55
--- /dev/null
+++ b/src/DSC/DSC_Basic/DSC_Basic.hxx
@@ -0,0 +1,47 @@
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  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. 
+// 
+//  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.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : DSC_Basic.hxx
+//  Author : Natalia ERMOLAYEVA
+//  Module : SALOME
+
+#ifndef _DSC_Basic_HXX_
+#define _DSC_Basic_HXX_
+
+#ifdef WNT
+ #if defined DSC_BASIC_EXPORTS
+  #if defined WIN32
+   #define DSC_BASIC_EXPORT __declspec( dllexport )
+  #else
+   #define DSC_BASIC_EXPORT
+  #endif
+ #else
+  #if defined WIN32
+   #define DSC_BASIC_EXPORT __declspec( dllimport )
+  #else
+   #define DSC_BASIC_EXPORT
+  #endif
+ #endif
+#else
+ #define DSC_BASIC_EXPORT
+#endif
+
+#endif
\ No newline at end of file

diff --git a/src/DSC/DSC_Basic/DSC_Callbacks.hxx b/src/DSC/DSC_Basic/DSC_Callbacks.hxx
index e37dd60e8196d78d2e3cced1ff5117cb5f17d7f0..ffdf57d767d06f7bc0422209ab6c3b0561b59dfc 100644 (file)
--- a/src/DSC/DSC_Basic/DSC_Callbacks.hxx
+++ b/src/DSC/DSC_Basic/DSC_Callbacks.hxx
@@ -26,6 +26,8 @@
 #ifndef _DSC_CALLBACKS_HXX_
 #define _DSC_CALLBACKS_HXX_
 
+#include <DSC_Basic.hxx>
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(DSC_Engines)
 
@@ -34,7 +36,7 @@
  *  uses to prevent the component user code that the state of the component has changed.
  *  Currently only port's connection modifications are signaled.
  */
-class DSC_Callbacks
+class DSC_BASIC_EXPORT DSC_Callbacks
 {
   public:
     DSC_Callbacks() {}

diff --git a/src/DSC/DSC_Basic/DSC_i.hxx b/src/DSC/DSC_Basic/DSC_i.hxx
index 80ececc4b1374afa371a13de7de5ad6264f6582e..6a495f9ce2ab82c9a22afe6ca379a4ebea06f827 100644 (file)
--- a/src/DSC/DSC_Basic/DSC_i.hxx
+++ b/src/DSC/DSC_Basic/DSC_i.hxx
@@ -26,6 +26,8 @@
 #ifndef _DSC_I_HXX_
 #define _DSC_I_HXX_
 
+#include <DSC_Basic.hxx>
+
 #include <iostream>
 #include <map>
 #include <string.h>
@@ -39,7 +41,7 @@
  *
  *  The implementation of methods are performed by the class Engines_DSC_interface.
  */
-class Engines_DSC_i: 
+class DSC_BASIC_EXPORT Engines_DSC_i: 
   public Engines_Component_i, // keyword virtual is not use to be able to
                              // call the right Engines_Component_i constructor.
                              // If virtual is used, a derived class of Engines_DSC_i

diff --git a/src/DSC/DSC_Basic/DSC_interface.cxx b/src/DSC/DSC_Basic/DSC_interface.cxx
index d96b2c5454ae7cbcde1690842fa10861bfd667fc..b32d69bfdce21414664a93ca5a112b6ca02af2e8 100644 (file)
--- a/src/DSC/DSC_Basic/DSC_interface.cxx
+++ b/src/DSC/DSC_Basic/DSC_interface.cxx
@@ -23,6 +23,7 @@
 //  Author : André RIBES (EDF)
 //  Module : KERNEL
 
+#include <string>
 #include "DSC_interface.hxx"
 
 Engines_DSC_interface::Engines_DSC_interface() {}

diff --git a/src/DSC/DSC_Basic/Makefile.am b/src/DSC/DSC_Basic/Makefile.am
index 3272b3e24e3f1b5f5a077a31fd32abf462beb49b..07946f3c10882656d5f38db62ea132f385fb8074 100644 (file)
--- a/src/DSC/DSC_Basic/Makefile.am
+++ b/src/DSC/DSC_Basic/Makefile.am
@@ -35,7 +35,8 @@ salomeinclude_HEADERS = ConnectionManager_i.hxx \
                        DSC_Callbacks.hxx \
                        DSC_i.hxx \
                        DSC_interface.hxx \
-                       PortProperties_i.hxx
+                       PortProperties_i.hxx \
+                       DSC_Basic.hxx
 #
 # ===============================================================
 # Local definitions

diff --git a/src/DSC/DSC_Basic/PortProperties_i.hxx b/src/DSC/DSC_Basic/PortProperties_i.hxx
index a6e713b586c33e3c993d4f472e48adae4dd19aea..90d2132cefecbc8d8b4ab555db3566b3597321a5 100644 (file)
--- a/src/DSC/DSC_Basic/PortProperties_i.hxx
+++ b/src/DSC/DSC_Basic/PortProperties_i.hxx
@@ -26,13 +26,15 @@
 #ifndef _PORTPROPERTIES_I_HXX_
 #define _PORTPROPERTIES_I_HXX_
 
+#include <DSC_Basic.hxx>
+
 #include <SALOMEconfig.h>
 #include CORBA_SERVER_HEADER(SALOME_Ports)
 
 /*! \class PortProperties_i
  *  \brief This class implements the interface Ports::PortProperties.
  */
-class PortProperties_i:
+class DSC_BASIC_EXPORT PortProperties_i:
   public virtual POA_Ports::PortProperties
 {
   public: