From 6bb69d11b635361262b7937cc17c296a9059e976 Mon Sep 17 00:00:00 2001 From: ana Date: Tue, 3 Feb 2015 19:10:32 +0300 Subject: [PATCH] Windows compatibility --- src/SALOMESDS/SALOMESDS_DataScopeServer.hxx | 3 +- src/SALOMESDS/SALOMESDS_DataServerManager.hxx | 4 ++- src/SALOMESDS/SALOMESDS_Defines.hxx | 33 +++++++++++++++++++ src/SALOMESDS/SALOMESDS_Exception.hxx | 4 ++- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 src/SALOMESDS/SALOMESDS_Defines.hxx diff --git a/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx b/src/SALOMESDS/SALOMESDS_DataScopeServer.hxx index 1147ba665..a8b740c92 100644 --- 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 @@ -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 cf835c486..b4cbfba7e 100644 --- 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 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 index 000000000..1a464d61e --- /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 c5943ae8a..833a08d1a 100644 --- 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 namespace SALOMESDS { - class Exception : public SALOME::SALOME_Exception + class SALOMESDS_EXPORT Exception : public SALOME::SALOME_Exception { public: Exception(const std::string& reason); -- 2.39.2