From e158e1eff76d8983bccf0a4529ff12972398b9f6 Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 2 May 2007 13:52:23 +0000 Subject: [PATCH] Modification for Win32 platform --- src/DSC/DSC_Basic/ConnectionManager_i.hxx | 4 +- src/DSC/DSC_Basic/DSC_Basic.hxx | 47 +++++++++++++++++++++++ src/DSC/DSC_Basic/DSC_Callbacks.hxx | 4 +- src/DSC/DSC_Basic/DSC_i.hxx | 4 +- src/DSC/DSC_Basic/DSC_interface.cxx | 1 + src/DSC/DSC_Basic/Makefile.am | 3 +- src/DSC/DSC_Basic/PortProperties_i.hxx | 4 +- 7 files changed, 62 insertions(+), 5 deletions(-) create mode 100755 src/DSC/DSC_Basic/DSC_Basic.hxx diff --git a/src/DSC/DSC_Basic/ConnectionManager_i.hxx b/src/DSC/DSC_Basic/ConnectionManager_i.hxx index 185b77aee..e3475f243 100644 --- 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 + #include #include #include @@ -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 index 000000000..0c94e55e6 --- /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 e37dd60e8..ffdf57d76 100644 --- 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 + #include #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 80ececc4b..6a495f9ce 100644 --- 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 + #include #include #include @@ -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 d96b2c545..b32d69bfd 100644 --- 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 #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 3272b3e24..07946f3c1 100644 --- 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 a6e713b58..90d2132ce 100644 --- 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 + #include #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: -- 2.39.2