From b0cda1848158fab8dd3dc2315f2623c63e14564c Mon Sep 17 00:00:00 2001 From: abd Date: Mon, 6 Mar 2006 08:17:48 +0000 Subject: [PATCH] Updated environment and import/export directives --- src/Basics/BasicsGenericDestructor.hxx | 48 ++++++++++--------- src/Communication/MultiCommException.hxx | 5 +- src/Communication/ReceiverFactory.hxx | 4 +- src/Communication/SALOMEMultiComm.hxx | 4 +- src/Communication/SALOME_Comm_i.hxx | 28 ++++++----- src/Communication/SALOME_Communication.hxx | 47 ++++++++++++++++++ src/Communication/SenderFactory.hxx | 4 +- src/Container/Container_init_python.hxx | 16 +------ src/Container/SALOME_Component_i.hxx | 16 +------ src/Container/SALOME_Container.hxx | 47 ++++++++++++++++++ src/Container/SALOME_ContainerManager.hxx | 16 +------ src/Container/SALOME_Container_i.hxx | 17 +------ .../SALOME_DataTypeCatalog.hxx | 47 ++++++++++++++++++ .../SALOME_DataTypeCatalog_Handler.hxx | 16 +------ .../SALOME_DataTypeCatalog_impl.hxx | 16 +------ src/HDFPersist/HDFdatasetGetOrder.c | 2 +- src/HDFPersist/HDFobjectType.c | 1 - src/ModuleCatalog/SALOME_ModuleCatalog.hxx | 47 ++++++++++++++++++ .../SALOME_ModuleCatalog_Acomponent_impl.hxx | 16 +------ .../SALOME_ModuleCatalog_Handler.hxx | 16 +------ .../SALOME_ModuleCatalog_impl.hxx | 17 +------ .../NamingService_WaitForServerReadiness.hxx | 10 ++-- src/NamingService/ServiceUnreachable.hxx | 6 +-- src/Notification/NOTIFICATION.hxx | 17 +------ src/Notification/NOTIFICATION_Consumer.hxx | 14 +----- src/Notification/NOTIFICATION_Supplier.hxx | 14 +----- src/Notification/SALOME_NOTIFICATION.hxx | 47 ++++++++++++++++++ src/Registry/RegistryConnexion.hxx | 16 +------ src/Registry/RegistryService.hxx | 16 +------ src/Registry/SALOME_Registry.hxx | 47 ++++++++++++++++++ .../SALOME_ResourcesManager.hxx | 16 ------- .../SALOME_RessourcesCatalog_impl.hxx | 14 ------ src/SALOMEDS/SALOMEDS.hxx | 4 +- src/SALOMEDS/SALOMEDS_Defines.hxx | 47 ++++++++++++++++++ src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx | 9 ---- src/SALOMELocalTrace/BaseTraceCollector.hxx | 17 +------ src/SALOMELocalTrace/FileTraceCollector.hxx | 2 + src/SALOMELocalTrace/LocalTraceBufferPool.hxx | 2 + src/SALOMELocalTrace/LocalTraceCollector.hxx | 2 + src/TOOLSDS/SALOMEDS_Tool.hxx | 19 ++++++-- src/Utils/OpUtil.hxx | 14 +----- src/Utils/SalomeString.hxx | 4 +- src/Utils/Utils_CommException.hxx | 2 + src/Utils/Utils_CorbaException.hxx | 2 + src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx | 30 ++++-------- src/Utils/Utils_ExceptHandlers.hxx | 16 +------ src/Utils/Utils_Identity.hxx | 15 +----- src/Utils/Utils_Mutex.hxx | 16 +------ src/Utils/Utils_ORB_INIT.hxx | 17 +------ src/Utils/Utils_SALOME_Exception.hxx | 16 +------ src/Utils/Utils_SINGLETON.hxx | 2 + src/Utils/Utils_SignalsHandler.h | 15 +----- src/Utils/Utils_Timer.hxx | 4 +- 53 files changed, 474 insertions(+), 428 deletions(-) create mode 100755 src/Communication/SALOME_Communication.hxx create mode 100755 src/Container/SALOME_Container.hxx create mode 100755 src/DataTypeCatalog/SALOME_DataTypeCatalog.hxx create mode 100755 src/ModuleCatalog/SALOME_ModuleCatalog.hxx create mode 100755 src/Notification/SALOME_NOTIFICATION.hxx create mode 100755 src/Registry/SALOME_Registry.hxx create mode 100755 src/SALOMEDS/SALOMEDS_Defines.hxx diff --git a/src/Basics/BasicsGenericDestructor.hxx b/src/Basics/BasicsGenericDestructor.hxx index 1245a43a2..8960eac84 100644 --- a/src/Basics/BasicsGenericDestructor.hxx +++ b/src/Basics/BasicsGenericDestructor.hxx @@ -29,6 +29,24 @@ #ifndef _BASICGENERICDESTRUCTOR_HXX_ #define _BASICGENERICDESTRUCTOR_HXX_ +#ifdef WNT + #if defined BASICS_EXPORTS + #if defined WIN32 + #define BASICS_EXPORT __declspec( dllexport ) + #else + #define BASICS_EXPORT + #endif + #else + #if defined WIN32 + #define BASICS_EXPORT __declspec( dllimport ) + #else + #define BASICS_EXPORT + #endif + #endif +#else + #define BASICS_EXPORT +#endif + #include #include #include @@ -37,20 +55,6 @@ #include #include -#if defined BASICS_EXPORTS -#if defined WIN32 -#define BASICS_EXPORT __declspec( dllexport ) -#else -#define BASICS_EXPORT -#endif -#else -#if defined WNT -#define BASICS_EXPORT __declspec( dllimport ) -#else -#define BASICS_EXPORT -#endif -#endif - //#define _DEVDEBUG_ #ifdef _DEVDEBUG_ @@ -79,14 +83,14 @@ */ // ============================================================================ -class PROTECTED_DELETE +class BASICS_EXPORT PROTECTED_DELETE { public: - BASICS_EXPORT static void deleteInstance(PROTECTED_DELETE *anObject); - BASICS_EXPORT static void addObj(PROTECTED_DELETE *anObject); + static void deleteInstance(PROTECTED_DELETE *anObject); + static void addObj(PROTECTED_DELETE *anObject); protected: - BASICS_EXPORT virtual ~PROTECTED_DELETE(); + virtual ~PROTECTED_DELETE(); static std::list _objList; private: @@ -111,14 +115,14 @@ private: */ // ============================================================================ -class GENERIC_DESTRUCTOR +class BASICS_EXPORT GENERIC_DESTRUCTOR { public : - BASICS_EXPORT static std::list *Destructors; + static std::list *Destructors; virtual ~GENERIC_DESTRUCTOR() {}; - BASICS_EXPORT static const int Add(GENERIC_DESTRUCTOR &anObject); - BASICS_EXPORT virtual void operator()(void) = 0; + static const int Add(GENERIC_DESTRUCTOR &anObject); + virtual void operator()(void) = 0; }; // ============================================================================ diff --git a/src/Communication/MultiCommException.hxx b/src/Communication/MultiCommException.hxx index d3a350e4b..acff9fe2c 100644 --- a/src/Communication/MultiCommException.hxx +++ b/src/Communication/MultiCommException.hxx @@ -20,10 +20,11 @@ #ifndef _MULTICOMMEXCEPTION_HXX_ #define _MULTICOMMEXCEPTION_HXX_ -#include +#include +#include -class MultiCommException { +class COMMUNICATION_EXPORT MultiCommException { private: std::string _message; public: diff --git a/src/Communication/ReceiverFactory.hxx b/src/Communication/ReceiverFactory.hxx index 1c41cf6bc..f950e407e 100644 --- a/src/Communication/ReceiverFactory.hxx +++ b/src/Communication/ReceiverFactory.hxx @@ -20,6 +20,8 @@ #ifndef _RECEIVERFACTORY_HXX_ #define _RECEIVERFACTORY_HXX_ +#include + #include #include CORBA_SERVER_HEADER(SALOME_Comm) #include "MultiCommException.hxx" @@ -28,7 +30,7 @@ This class internally builds a receiver associated with the sender given. It also performs transfert completely and clean up the objects. This is the only class used client side of an array. */ -class ReceiverFactory +class COMMUNICATION_EXPORT ReceiverFactory { public: static double *getValue(SALOME::SenderDouble_ptr sender,long &size)throw(MultiCommException); diff --git a/src/Communication/SALOMEMultiComm.hxx b/src/Communication/SALOMEMultiComm.hxx index cdd73e7c8..8fd3751b0 100644 --- a/src/Communication/SALOMEMultiComm.hxx +++ b/src/Communication/SALOMEMultiComm.hxx @@ -20,6 +20,8 @@ #ifndef _SALOMEMULTICOMM_HXX_ #define _SALOMEMULTICOMM_HXX_ +#include + #include #include CORBA_SERVER_HEADER(SALOME_Comm) @@ -27,7 +29,7 @@ Class is designed to ease the use of multi communication.\n Simply inherite from it your servant class you want to emit data with senders. */ -class SALOMEMultiComm : public virtual POA_SALOME::MultiCommClass { +class COMMUNICATION_EXPORT SALOMEMultiComm : public virtual POA_SALOME::MultiCommClass { protected: SALOME::TypeOfCommunication _type; public: diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index e5e0c65ce..a70b4c28e 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -20,6 +20,8 @@ #ifndef _SALOME_COMM_I_HXX_ #define _SALOME_COMM_I_HXX_ +#include + #ifdef HAVE_MPI2 #include "mpi.h" #endif @@ -34,7 +36,7 @@ Generic servant class for senders that factorizes all the common methods and attributes necessary to senders. All servant classes for senders have to inheritate from it. */ -class SALOME_Sender_i : public virtual POA_SALOME::Sender, +class COMMUNICATION_EXPORT SALOME_Sender_i : public virtual POA_SALOME::Sender, public PortableServer::RefCountServantBase { protected: /*! Pointer to the generic array to transmit*/ @@ -58,7 +60,7 @@ public: virtual ~SALOME_Sender_i() {} }; -class SALOME_SenderDouble_i : public virtual POA_SALOME::SenderDouble, +class COMMUNICATION_EXPORT SALOME_SenderDouble_i : public virtual POA_SALOME::SenderDouble, public virtual SALOME_Sender_i { public: @@ -69,7 +71,7 @@ public: static SALOME_SenderDouble_i *find(SALOME::SenderDouble_ptr pCorba); }; -class SALOME_SenderInt_i : public virtual POA_SALOME::SenderInt, +class COMMUNICATION_EXPORT SALOME_SenderInt_i : public virtual POA_SALOME::SenderInt, public virtual SALOME_Sender_i { public: @@ -82,7 +84,7 @@ public: /*! Servant class for CORBA sender for double* when no copy of array _tabToSend is required, that is to say double and CORBA::Double are binary equal. */ -class SALOME_CorbaDoubleNCSender_i : public POA_SALOME::CorbaDoubleNCSender, +class COMMUNICATION_EXPORT SALOME_CorbaDoubleNCSender_i : public POA_SALOME::CorbaDoubleNCSender, public SALOME_SenderDouble_i { public: @@ -95,7 +97,7 @@ public: /*! Servant class for CORBA sender for double* when copy of array _tabToSend is required, that is to say double and CORBA::Double are NOT binary equal. */ -class SALOME_CorbaDoubleCSender_i : public POA_SALOME::CorbaDoubleCSender, +class COMMUNICATION_EXPORT SALOME_CorbaDoubleCSender_i : public POA_SALOME::CorbaDoubleCSender, public SALOME_SenderDouble_i { public: @@ -107,7 +109,7 @@ public: /*! Servant class for CORBA sender for int* when no copy of array _tabToSend is required, that is to say int and CORBA::Long are binary equal. */ -class SALOME_CorbaLongNCSender_i : public POA_SALOME::CorbaLongNCSender, +class COMMUNICATION_EXPORT SALOME_CorbaLongNCSender_i : public POA_SALOME::CorbaLongNCSender, public SALOME_SenderInt_i { public: @@ -120,7 +122,7 @@ public: /*! Servant class for CORBA sender for int* when copy of array _tabToSend is required, that is to say int and CORBA::Long are NOT binary equal. */ -class SALOME_CorbaLongCSender_i : public POA_SALOME::CorbaLongCSender, +class COMMUNICATION_EXPORT SALOME_CorbaLongCSender_i : public POA_SALOME::CorbaLongCSender, public SALOME_SenderInt_i { public: @@ -137,7 +139,7 @@ public: /*! Servant class of sender using MPI2. */ -class SALOME_MPISender_i : public virtual POA_SALOME::MPISender, +class COMMUNICATION_EXPORT SALOME_MPISender_i : public virtual POA_SALOME::MPISender, public virtual SALOME_Sender_i { private: @@ -168,7 +170,7 @@ private: static void* myThread(void *args); }; -class SALOME_MPISenderDouble_i : public POA_SALOME::MPISenderDouble, +class COMMUNICATION_EXPORT SALOME_MPISenderDouble_i : public POA_SALOME::MPISenderDouble, public SALOME_SenderDouble_i, public SALOME_MPISender_i { @@ -176,7 +178,7 @@ public: SALOME_MPISenderDouble_i(const double *tabToSend,long lgrTabToSend,bool ownTabToSend=false); }; -class SALOME_MPISenderInt_i : public POA_SALOME::MPISenderInt, +class COMMUNICATION_EXPORT SALOME_MPISenderInt_i : public POA_SALOME::MPISenderInt, public SALOME_SenderInt_i, public SALOME_MPISender_i { @@ -190,7 +192,7 @@ public: /*! Servant class of sender using Sockets. */ -class SALOME_SocketSender_i : public virtual POA_SALOME::SocketSender, +class COMMUNICATION_EXPORT SALOME_SocketSender_i : public virtual POA_SALOME::SocketSender, public virtual SALOME_Sender_i { private: @@ -217,7 +219,7 @@ private: std::string inetAddress(); }; -class SALOME_SocketSenderDouble_i : public POA_SALOME::SocketSenderDouble, +class COMMUNICATION_EXPORT SALOME_SocketSenderDouble_i : public POA_SALOME::SocketSenderDouble, public SALOME_SenderDouble_i, public SALOME_SocketSender_i { @@ -225,7 +227,7 @@ public: SALOME_SocketSenderDouble_i(const double *tabToSend,long lgrTabToSend,bool ownTabToSend=false); }; -class SALOME_SocketSenderInt_i : public POA_SALOME::SocketSenderInt, +class COMMUNICATION_EXPORT SALOME_SocketSenderInt_i : public POA_SALOME::SocketSenderInt, public SALOME_SenderInt_i, public SALOME_SocketSender_i { diff --git a/src/Communication/SALOME_Communication.hxx b/src/Communication/SALOME_Communication.hxx new file mode 100755 index 000000000..c3593fbc5 --- /dev/null +++ b/src/Communication/SALOME_Communication.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 : SALOME_Communication.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_COMMIUNICATION_HXX_ +#define _SALOME_COMMIUNICATION_HXX_ + +#ifdef WNT + #if defined COMMUNICATION_EXPORTS + #if defined WIN32 + #define COMMUNICATION_EXPORT __declspec( dllexport ) + #else + #define COMMUNICATION_EXPORT + #endif + #else + #if defined WIN32 + #define COMMUNICATION_EXPORT __declspec( dllimport ) + #else + #define COMMUNICATION_EXPORT + #endif + #endif +#else + #define COMMUNICATION_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/Communication/SenderFactory.hxx b/src/Communication/SenderFactory.hxx index 07a54d8a0..29baf4447 100644 --- a/src/Communication/SenderFactory.hxx +++ b/src/Communication/SenderFactory.hxx @@ -20,6 +20,8 @@ #ifndef _SENDERFACTORY_HXX_ #define _SENDERFACTORY_HXX_ +#include + #include "MultiCommException.hxx" #include #include CORBA_SERVER_HEADER(SALOME_Comm) @@ -32,7 +34,7 @@ class SALOME_SenderInt_i; /*! This class implements the factory pattern of GoF by making a sender by giving an array and a communicator.It completely hides the type of sender from the user. */ -class SenderFactory +class COMMUNICATION_EXPORT SenderFactory { public: static SALOME::SenderDouble_ptr buildSender(SALOMEMultiComm &multiCommunicator,const double *tab,long lgr,bool ownTab=false) throw(MultiCommException); diff --git a/src/Container/Container_init_python.hxx b/src/Container/Container_init_python.hxx index 291f6f498..8450ec8d7 100644 --- a/src/Container/Container_init_python.hxx +++ b/src/Container/Container_init_python.hxx @@ -29,6 +29,8 @@ #ifndef _CONTAINER_INIT_PYTHON_HXX_ #define _CONTAINER_INIT_PYTHON_HXX_ +#include + #include // must be before Python.h ! #include @@ -45,20 +47,6 @@ // - There is no need of C Lock protection of the sequence. -#if defined CONTAINER_EXPORTS -#if defined WIN32 -#define CONTAINER_EXPORT __declspec( dllexport ) -#else -#define CONTAINER_EXPORT -#endif -#else -#if defined WNT -#define CONTAINER_EXPORT __declspec( dllimport ) -#else -#define CONTAINER_EXPORT -#endif -#endif - #define Py_ACQUIRE_NEW_THREAD \ PyEval_AcquireLock(); \ PyThreadState *myTstate = PyThreadState_New(KERNEL_PYTHON::_interp); \ diff --git a/src/Container/SALOME_Component_i.hxx b/src/Container/SALOME_Component_i.hxx index c8de1f1aa..7aae8c7c2 100644 --- a/src/Container/SALOME_Component_i.hxx +++ b/src/Container/SALOME_Component_i.hxx @@ -29,6 +29,8 @@ #ifndef _SALOME_COMPONENT_I_HXX_ #define _SALOME_COMPONENT_I_HXX_ +#include + #include #include #include @@ -45,20 +47,6 @@ class RegistryConnexion; class Engines_Container_i; -#if defined CONTAINER_EXPORTS -#if defined WIN32 -#define CONTAINER_EXPORT __declspec( dllexport ) -#else -#define CONTAINER_EXPORT -#endif -#else -#if defined WNT -#define CONTAINER_EXPORT __declspec( dllimport ) -#else -#define CONTAINER_EXPORT -#endif -#endif - class CONTAINER_EXPORT Engines_Component_i: public virtual POA_Engines::Component, public virtual PortableServer::RefCountServantBase diff --git a/src/Container/SALOME_Container.hxx b/src/Container/SALOME_Container.hxx new file mode 100755 index 000000000..9cd47d400 --- /dev/null +++ b/src/Container/SALOME_Container.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 : SALOME_Container.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_Container_HXX_ +#define _SALOME_Container_HXX_ + +#ifdef WNT + #if defined CONTAINER_EXPORTS + #if defined WIN32 + #define CONTAINER_EXPORT __declspec( dllexport ) + #else + #define CONTAINER_EXPORT + #endif + #else + #if defined WIN32 + #define CONTAINER_EXPORT __declspec( dllimport ) + #else + #define CONTAINER_EXPORT + #endif + #endif +#else + #define CONTAINER_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/Container/SALOME_ContainerManager.hxx b/src/Container/SALOME_ContainerManager.hxx index 323c0a3fd..e22153155 100644 --- a/src/Container/SALOME_ContainerManager.hxx +++ b/src/Container/SALOME_ContainerManager.hxx @@ -20,6 +20,8 @@ #ifndef __SALOME_CONTAINERMANAGER_HXX__ #define __SALOME_CONTAINERMANAGER_HXX__ +#include + #include #include CORBA_CLIENT_HEADER(SALOME_Component) #include CORBA_CLIENT_HEADER(SALOME_ContainerManager) @@ -30,20 +32,6 @@ class SALOME_NamingService; -#if defined CONTAINER_EXPORTS -#if defined WIN32 -#define CONTAINER_EXPORT __declspec( dllexport ) -#else -#define CONTAINER_EXPORT -#endif -#else -#if defined WNT -#define CONTAINER_EXPORT __declspec( dllimport ) -#else -#define CONTAINER_EXPORT -#endif -#endif - class CONTAINER_EXPORT SALOME_ContainerManager: public POA_Engines::ContainerManager, public PortableServer::RefCountServantBase diff --git a/src/Container/SALOME_Container_i.hxx b/src/Container/SALOME_Container_i.hxx index be21173b0..83cabae8c 100644 --- a/src/Container/SALOME_Container_i.hxx +++ b/src/Container/SALOME_Container_i.hxx @@ -29,6 +29,8 @@ #ifndef _SALOME_CONTAINER_I_HXX_ #define _SALOME_CONTAINER_I_HXX_ +#include + #include #include CORBA_SERVER_HEADER(SALOME_Component) @@ -45,21 +47,6 @@ class SALOME_NamingService; - -#if defined CONTAINER_EXPORTS -#if defined WIN32 -#define CONTAINER_EXPORT __declspec( dllexport ) -#else -#define CONTAINER_EXPORT -#endif -#else -#if defined WNT -#define CONTAINER_EXPORT __declspec( dllimport ) -#else -#define CONTAINER_EXPORT -#endif -#endif - class CONTAINER_EXPORT Engines_Container_i: public virtual POA_Engines::Container, public virtual PortableServer::RefCountServantBase diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog.hxx new file mode 100755 index 000000000..d36b23331 --- /dev/null +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog.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 : SALOME_DataTypeCatalog.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_DataTypeCatalog_HXX_ +#define _SALOME_DataTypeCatalog_HXX_ + +#ifdef WNT + #if defined DATATYPECATALOG_EXPORTS + #if defined WIN32 + #define DATATYPECATALOG_EXPORT __declspec( dllexport ) + #else + #define DATATYPECATALOG_EXPORT + #endif + #else + #if defined WIN32 + #define DATATYPECATALOG_EXPORT __declspec( dllimport ) + #else + #define DATATYPECATALOG_EXPORT + #endif + #endif +#else + #define DATATYPECATALOG_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx index 77b06a5b8..3e636940b 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_Handler.hxx @@ -29,25 +29,13 @@ #ifndef SALOME_DATA_CATALOG_HANDLER_H #define SALOME_DATA_CATALOG_HANDLER_H +#include + #include "SALOME_DataTypeCatalog_Parser.hxx" #include #include #include -#if defined DATATYPECATALOG_EXPORTS -#if defined WIN32 -#define DATATYPECATALOG_EXPORT __declspec( dllexport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#else -#if defined WNT -#define DATATYPECATALOG_EXPORT __declspec( dllimport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#endif - class DATATYPECATALOG_EXPORT SALOME_DataTypeCatalog_Handler : public QXmlDefaultHandler { public: diff --git a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx index 6b662f6b2..534f3e472 100644 --- a/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx +++ b/src/DataTypeCatalog/SALOME_DataTypeCatalog_impl.hxx @@ -29,25 +29,13 @@ #ifndef DATATYPECATALOG_IMPL_H #define DATATYPECATALOG_IMPL_H +#include + #include "utilities.h" #include "SALOME_DataTypeCatalog_Handler.hxx" #include #include CORBA_SERVER_HEADER(SALOME_DataTypeCatalog) -#if defined DATATYPECATALOG_EXPORTS -#if defined WIN32 -#define DATATYPECATALOG_EXPORT __declspec( dllexport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#else -#if defined WNT -#define DATATYPECATALOG_EXPORT __declspec( dllimport ) -#else -#define DATATYPECATALOG_EXPORT -#endif -#endif - class DATATYPECATALOG_EXPORT SALOME_DataTypeCatalogImpl: public POA_SALOME_DataTypeCatalog::DataCatalog, public PortableServer::RefCountServantBase { diff --git a/src/HDFPersist/HDFdatasetGetOrder.c b/src/HDFPersist/HDFdatasetGetOrder.c index 38b065826..34d5f7fbc 100644 --- a/src/HDFPersist/HDFdatasetGetOrder.c +++ b/src/HDFPersist/HDFdatasetGetOrder.c @@ -36,7 +36,7 @@ HDFdatasetGetOrder(hdf_idt dataset_id) hdf_byte_order order; if ((type_id = H5Dget_type(dataset_id)) < 0) - return -1; + return H5T_ORDER_ERROR; order = H5Tget_order(type_id); diff --git a/src/HDFPersist/HDFobjectType.c b/src/HDFPersist/HDFobjectType.c index a26c3f6fa..a4adc306b 100644 --- a/src/HDFPersist/HDFobjectType.c +++ b/src/HDFPersist/HDFobjectType.c @@ -31,7 +31,6 @@ Module : SALOME hdf_err HDFobjectType(hdf_idt id, char *name, hdf_object_type *type) { - hdf_object_type rep; hdf_bool follow = 1; H5G_stat_t buf; hdf_err ret; diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog.hxx new file mode 100755 index 000000000..5bfef04fe --- /dev/null +++ b/src/ModuleCatalog/SALOME_ModuleCatalog.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 : SALOME_ModuleCatalog.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_ModuleCatalog_HXX_ +#define _SALOME_ModuleCatalog_HXX_ + +#ifdef WNT + #if defined MODULECATALOG_EXPORTS + #if defined WIN32 + #define MODULECATALOG_EXPORT __declspec( dllexport ) + #else + #define MODULECATALOG_EXPORT + #endif + #else + #if defined WIN32 + #define MODULECATALOG_EXPORT __declspec( dllimport ) + #else + #define MODULECATALOG_EXPORT + #endif + #endif +#else + #define MODULECATALOG_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx index e56d8a3fb..ce4fcf3a2 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Acomponent_impl.hxx @@ -29,25 +29,13 @@ #ifndef ACOMPONENT_IMPL_H #define ACOMPONENT_IMPL_H +#include + #include "SALOME_ModuleCatalog_Parser.hxx" #include #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) -#if defined MODULECATALOG_EXPORTS -#if defined WIN32 -#define MODULECATALOG_EXPORT __declspec( dllexport ) -#else -#define MODULECATALOG_EXPORT -#endif -#else -#if defined WNT -#define MODULECATALOG_EXPORT __declspec( dllimport ) -#else -#define MODULECATALOG_EXPORT -#endif -#endif - class MODULECATALOG_EXPORT SALOME_ModuleCatalog_AcomponentImpl: public POA_SALOME_ModuleCatalog::Acomponent, public PortableServer::RefCountServantBase { diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx index add44e498..531160417 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_Handler.hxx @@ -29,26 +29,14 @@ #ifndef SALOME_CATALOG_HANDLER_H #define SALOME_CATALOG_HANDLER_H +#include + #include "SALOME_ModuleCatalog_Parser.hxx" #include #include #include #include -#if defined MODULECATALOG_EXPORTS -#if defined WIN32 -#define MODULECATALOG_EXPORT __declspec( dllexport ) -#else -#define MODULECATALOG_EXPORT -#endif -#else -#if defined WNT -#define MODULECATALOG_EXPORT __declspec( dllimport ) -#else -#define MODULECATALOG_EXPORT -#endif -#endif - class MODULECATALOG_EXPORT SALOME_ModuleCatalog_Handler : public QXmlDefaultHandler { public: diff --git a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx index aef5c2daf..6ff95122c 100644 --- a/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx +++ b/src/ModuleCatalog/SALOME_ModuleCatalog_impl.hxx @@ -30,6 +30,8 @@ #ifndef MODULECATALOG_IMPL_H #define MODULECATALOG_IMPL_H +#include + #include #include @@ -38,21 +40,6 @@ #include #include CORBA_SERVER_HEADER(SALOME_ModuleCatalog) - -#if defined MODULECATALOG_EXPORTS -#if defined WIN32 -#define MODULECATALOG_EXPORT __declspec( dllexport ) -#else -#define MODULECATALOG_EXPORT -#endif -#else -#if defined WNT -#define MODULECATALOG_EXPORT __declspec( dllimport ) -#else -#define MODULECATALOG_EXPORT -#endif -#endif - class MODULECATALOG_EXPORT SALOME_ModuleCatalogImpl: public POA_SALOME_ModuleCatalog::ModuleCatalog, public PortableServer::RefCountServantBase { diff --git a/src/NamingService/NamingService_WaitForServerReadiness.hxx b/src/NamingService/NamingService_WaitForServerReadiness.hxx index f5fdd578f..2ccb7096d 100644 --- a/src/NamingService/NamingService_WaitForServerReadiness.hxx +++ b/src/NamingService/NamingService_WaitForServerReadiness.hxx @@ -27,15 +27,11 @@ #ifndef _NAMINGSERVICE_WAITFORSERVERREADINESS_HXX_ #define _NAMINGSERVICE_WAITFORSERVERREADINESS_HXX_ -#include #include "SALOME_NamingService.hxx" -#ifdef WNT -#include -#else -#define SALOME_WNT_EXPORT -#endif -void SALOME_WNT_EXPORT NamingService_WaitForServerReadiness(SALOME_NamingService* NS, +#include + +void NAMINGSERVICE_EXPORT NamingService_WaitForServerReadiness(SALOME_NamingService* NS, std::string serverName); #endif diff --git a/src/NamingService/ServiceUnreachable.hxx b/src/NamingService/ServiceUnreachable.hxx index 9134e3244..2cf5e3ab6 100644 --- a/src/NamingService/ServiceUnreachable.hxx +++ b/src/NamingService/ServiceUnreachable.hxx @@ -29,10 +29,8 @@ #if !defined ( SERVICEUNREACHABLE_H ) #define SERVICEUNREACHABLE_H -#include "Utils_SALOME_Exception.hxx" - #if defined NAMINGSERVICE_EXPORTS -#if defined WIN32 +#if defined WNT #define NAMINGSERVICE_EXPORT __declspec( dllexport ) #else #define NAMINGSERVICE_EXPORT @@ -45,6 +43,8 @@ #endif #endif +#include "Utils_SALOME_Exception.hxx" + //! exception class for NamingService : ServiceUnreachable class NAMINGSERVICE_EXPORT ServiceUnreachable : public SALOME_Exception diff --git a/src/Notification/NOTIFICATION.hxx b/src/Notification/NOTIFICATION.hxx index 3bc49294b..036e419b4 100644 --- a/src/Notification/NOTIFICATION.hxx +++ b/src/Notification/NOTIFICATION.hxx @@ -28,6 +28,8 @@ #ifndef NOTIFICATION_HXX #define NOTIFICATION_HXX +#include + #define NOTIF_WARNING "Warning" #define NOTIF_STEP "Step" #define NOTIF_TRACE "Trace" @@ -43,21 +45,6 @@ #include "NOTIFICATION_Supplier.hxx" #include "NOTIFICATION_Consumer.hxx" - -#if defined NOTIFICATION_EXPORTS -#if defined WIN32 -#define NOTIFICATION_EXPORT __declspec( dllexport ) -#else -#define NOTIFICATION_EXPORT -#endif -#else -#if defined WNT -#define NOTIFICATION_EXPORT __declspec( dllimport ) -#else -#define NOTIFICATION_EXPORT -#endif -#endif - NOTIFICATION_EXPORT char* NOTIFICATION_date(); NOTIFICATION_EXPORT CosNA_EventChannel_ptr NOTIFICATION_channel(); diff --git a/src/Notification/NOTIFICATION_Consumer.hxx b/src/Notification/NOTIFICATION_Consumer.hxx index 653fca33f..e4edf5897 100644 --- a/src/Notification/NOTIFICATION_Consumer.hxx +++ b/src/Notification/NOTIFICATION_Consumer.hxx @@ -28,19 +28,7 @@ #ifndef NOTIFICATION_Consumer_HXX #define NOTIFICATION_Consumer_HXX -#if defined NOTIFICATION_EXPORTS -#if defined WIN32 -#define NOTIFICATION_EXPORT __declspec( dllexport ) -#else -#define NOTIFICATION_EXPORT -#endif -#else -#if defined WNT -#define NOTIFICATION_EXPORT __declspec( dllimport ) -#else -#define NOTIFICATION_EXPORT -#endif -#endif +#include class NOTIFICATION_EXPORT NOTIFICATION_Consumer: public POA_CosNotifyComm::StructuredPullConsumer { public: diff --git a/src/Notification/NOTIFICATION_Supplier.hxx b/src/Notification/NOTIFICATION_Supplier.hxx index 0f7070226..58fa7b225 100644 --- a/src/Notification/NOTIFICATION_Supplier.hxx +++ b/src/Notification/NOTIFICATION_Supplier.hxx @@ -28,19 +28,7 @@ #ifndef NOTIFICATION_Supplier_HXX #define NOTIFICATION_Supplier_HXX -#if defined NOTIFICATION_EXPORTS -#if defined WIN32 -#define NOTIFICATION_EXPORT __declspec( dllexport ) -#else -#define NOTIFICATION_EXPORT -#endif -#else -#if defined WNT -#define NOTIFICATION_EXPORT __declspec( dllimport ) -#else -#define NOTIFICATION_EXPORT -#endif -#endif +#include class NOTIFICATION_EXPORT NOTIFICATION_Supplier: public POA_CosNotifyComm::StructuredPushSupplier { public: diff --git a/src/Notification/SALOME_NOTIFICATION.hxx b/src/Notification/SALOME_NOTIFICATION.hxx new file mode 100755 index 000000000..cc878e389 --- /dev/null +++ b/src/Notification/SALOME_NOTIFICATION.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 : SALOME_NOTIFICATION.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_NOTIFICATION_HXX_ +#define _SALOME_NOTIFICATION_HXX_ + +#ifdef WNT + #if defined NOTIFICATION_EXPORTS + #if defined WIN32 + #define NOTIFICATION_EXPORT __declspec( dllexport ) + #else + #define NOTIFICATION_EXPORT + #endif + #else + #if defined WIN32 + #define NOTIFICATION_EXPORT __declspec( dllimport ) + #else + #define NOTIFICATION_EXPORT + #endif + #endif +#else + #define NOTIFICATION_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/Registry/RegistryConnexion.hxx b/src/Registry/RegistryConnexion.hxx index c241618ef..643ba2558 100644 --- a/src/Registry/RegistryConnexion.hxx +++ b/src/Registry/RegistryConnexion.hxx @@ -33,24 +33,12 @@ # if !defined( __RegistryConnexion_HXX__ ) # define __RegistryConnexion_HXX__ +#include + #include #include CORBA_CLIENT_HEADER(SALOME_Registry) #include -#if defined REGISTRY_EXPORTS -#if defined WIN32 -#define REGISTRY_EXPORT __declspec( dllexport ) -#else -#define REGISTRY_EXPORT -#endif -#else -#if defined WNT -#define REGISTRY_EXPORT __declspec( dllimport ) -#else -#define REGISTRY_EXPORT -#endif -#endif - class REGISTRY_EXPORT RegistryConnexion { protected : diff --git a/src/Registry/RegistryService.hxx b/src/Registry/RegistryService.hxx index c07043e50..f739ef330 100644 --- a/src/Registry/RegistryService.hxx +++ b/src/Registry/RegistryService.hxx @@ -29,25 +29,13 @@ # ifndef __RegistryService_h__ # define __RegistryService_h__ +#include + #include #include CORBA_SERVER_HEADER(SALOME_Registry) # include -#if defined REGISTRY_EXPORTS -#if defined WIN32 -#define REGISTRY_EXPORT __declspec( dllexport ) -#else -#define REGISTRY_EXPORT -#endif -#else -#if defined WNT -#define REGISTRY_EXPORT __declspec( dllimport ) -#else -#define REGISTRY_EXPORT -#endif -#endif - class REGISTRY_EXPORT RegistryService : public POA_Registry::Components //, public PortableServer::RefCountServantBase { diff --git a/src/Registry/SALOME_Registry.hxx b/src/Registry/SALOME_Registry.hxx new file mode 100755 index 000000000..899bc5586 --- /dev/null +++ b/src/Registry/SALOME_Registry.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 : SALOME_Registry.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOME_Registry_HXX_ +#define _SALOME_Registry_HXX_ + +#ifdef WNT + #if defined REGISTRY_EXPORTS + #if defined WIN32 + #define REGISTRY_EXPORT __declspec( dllexport ) + #else + #define REGISTRY_EXPORT + #endif + #else + #if defined WIN32 + #define REGISTRY_EXPORT __declspec( dllimport ) + #else + #define REGISTRY_EXPORT + #endif + #endif +#else + #define REGISTRY_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/ResourcesManager/SALOME_ResourcesManager.hxx b/src/ResourcesManager/SALOME_ResourcesManager.hxx index 4f5466494..475b2353a 100644 --- a/src/ResourcesManager/SALOME_ResourcesManager.hxx +++ b/src/ResourcesManager/SALOME_ResourcesManager.hxx @@ -31,22 +31,6 @@ #include #include - - -#if defined RESOURCESMANAGER_EXPORTS -#if defined WIN32 -#define RESOURCESMANAGER_EXPORT __declspec( dllexport ) -#else -#define RESOURCESMANAGER_EXPORT -#endif -#else -#if defined WNT -#define RESOURCESMANAGER_EXPORT __declspec( dllimport ) -#else -#define RESOURCESMANAGER_EXPORT -#endif -#endif - // --- WARNING --- // The call of BuildTempFileToLaunchRemoteContainer and RmTmpFile must be done // in a critical section to be sure to be clean. diff --git a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx index 42237b98b..bd2bd95af 100644 --- a/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx +++ b/src/RessourcesCatalog/SALOME_RessourcesCatalog_impl.hxx @@ -34,20 +34,6 @@ #include #include CORBA_SERVER_HEADER(SALOME_RessourcesCatalog) -#if defined RESSOURCESCatalog_EXPORTS -#if defined WIN32 -#define RESSOURCESCatalog_EXPORT __declspec( dllexport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#else -#if defined WNT -#define RESSOURCESCatalog_EXPORT __declspec( dllimport ) -#else -#define RESSOURCESCatalog_EXPORT -#endif -#endif - class RESSOURCESCatalog_EXPORT SALOME_RessourcesCatalogImpl: public POA_SALOME_RessourcesCatalog::RessourcesCatalog, public PortableServer::RefCountServantBase { diff --git a/src/SALOMEDS/SALOMEDS.hxx b/src/SALOMEDS/SALOMEDS.hxx index 06ee1825e..c9dbdb39d 100644 --- a/src/SALOMEDS/SALOMEDS.hxx +++ b/src/SALOMEDS/SALOMEDS.hxx @@ -30,6 +30,8 @@ #ifndef SALOMEDS_HeaderFile #define SALOMEDS_HeaderFile +#include + #include namespace SALOMEDS @@ -43,7 +45,7 @@ namespace SALOMEDS // // Locker lock; // - class Locker : public Utils_Locker + class SALOMEDS_EXPORT Locker : public Utils_Locker { public: Locker(); diff --git a/src/SALOMEDS/SALOMEDS_Defines.hxx b/src/SALOMEDS/SALOMEDS_Defines.hxx new file mode 100755 index 000000000..53a8d961f --- /dev/null +++ b/src/SALOMEDS/SALOMEDS_Defines.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 : SALOMEDS_Defines.hxx +// Author : Alexander A. BORODIN +// Module : SALOME + +#ifndef _SALOMEDS_Defines_HXX_ +#define _SALOMEDS_Defines_HXX_ + +#ifdef WNT + #if defined SALOMEDS_EXPORTS + #if defined WIN32 + #define SALOMEDS_EXPORT __declspec( dllexport ) + #else + #define SALOMEDS_EXPORT + #endif + #else + #if defined WIN32 + #define SALOMEDS_EXPORT __declspec( dllimport ) + #else + #define SALOMEDS_EXPORT + #endif + #endif +#else + #define SALOMEDS_EXPORT +#endif + +#endif \ No newline at end of file diff --git a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx index d87b4ec8d..7dce63f41 100644 --- a/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx +++ b/src/SALOMEDSImpl/SALOMEDSImpl_Study.hxx @@ -43,11 +43,7 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_Study, MMgt_TShared ) #include #include #include -#ifndef WNT #include -#else -#include -#endif //SALOMEDSImpl headers #include "SALOMEDSImpl_SComponentIterator.hxx" @@ -63,13 +59,8 @@ DEFINE_STANDARD_HANDLE( SALOMEDSImpl_Study, MMgt_TShared ) class SALOMEDSImpl_StudyManager; class SALOMEDSImpl_GenericAttribute; -#ifndef WNT typedef NCollection_DataMap DataMapOfAsciiStringTransient; typedef NCollection_DataMap DataMapAsciiStringLabel; -#else -typedef NCollection_DataMap1 DataMapOfAsciiStringTransient; -typedef NCollection_DataMap1 DataMapAsciiStringLabel; -#endif class SALOMEDSImpl_Study : public MMgt_TShared { diff --git a/src/SALOMELocalTrace/BaseTraceCollector.hxx b/src/SALOMELocalTrace/BaseTraceCollector.hxx index dad4d9e0b..55bd20a35 100644 --- a/src/SALOMELocalTrace/BaseTraceCollector.hxx +++ b/src/SALOMELocalTrace/BaseTraceCollector.hxx @@ -27,24 +27,11 @@ #ifndef _BASETRACECOLLECTOR_HXX_ #define _BASETRACECOLLECTOR_HXX_ +#include + #include #include - -#if defined SALOMELOCALTRACE_EXPORTS -#if defined WIN32 -#define SALOMELOCALTRACE_EXPORT __declspec( dllexport ) -#else -#define SALOMELOCALTRACE_EXPORT -#endif -#else -#if defined WNT -#define SALOMELOCALTRACE_EXPORT __declspec( dllimport ) -#else -#define SALOMELOCALTRACE_EXPORT -#endif -#endif - //! See derived Classes in SALOMELocalTrace for usage without CORBA, //! see derived Classes in SALOMETraceCollector for usage with CORBA. diff --git a/src/SALOMELocalTrace/FileTraceCollector.hxx b/src/SALOMELocalTrace/FileTraceCollector.hxx index e25a3a182..189280a78 100644 --- a/src/SALOMELocalTrace/FileTraceCollector.hxx +++ b/src/SALOMELocalTrace/FileTraceCollector.hxx @@ -27,6 +27,8 @@ #ifndef _FILETRACECOLLECTOR_HXX_ #define _FILETRACECOLLECTOR_HXX_ +#include + #include #include "LocalTraceBufferPool.hxx" #include "BaseTraceCollector.hxx" diff --git a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx index 444730111..82d82b49f 100644 --- a/src/SALOMELocalTrace/LocalTraceBufferPool.hxx +++ b/src/SALOMELocalTrace/LocalTraceBufferPool.hxx @@ -24,6 +24,8 @@ #ifndef _LOCALTRACEBUFFERPOOL_HXX_ #define _LOCALTRACEBUFFERPOOL_HXX_ +#include + #define TRACE_BUFFER_SIZE 256 // number of entries in circular buffer // must be power of 2 #define MAX_TRACE_LENGTH 256 // messages are truncated at this size diff --git a/src/SALOMELocalTrace/LocalTraceCollector.hxx b/src/SALOMELocalTrace/LocalTraceCollector.hxx index 610e40f03..775bcb91f 100644 --- a/src/SALOMELocalTrace/LocalTraceCollector.hxx +++ b/src/SALOMELocalTrace/LocalTraceCollector.hxx @@ -27,6 +27,8 @@ #ifndef _LOCALTRACECOLLECTOR_HXX_ #define _LOCALTRACECOLLECTOR_HXX_ +#include + #include #include "LocalTraceBufferPool.hxx" #include "BaseTraceCollector.hxx" diff --git a/src/TOOLSDS/SALOMEDS_Tool.hxx b/src/TOOLSDS/SALOMEDS_Tool.hxx index c36de54e7..313ed4b77 100644 --- a/src/TOOLSDS/SALOMEDS_Tool.hxx +++ b/src/TOOLSDS/SALOMEDS_Tool.hxx @@ -38,14 +38,25 @@ #include CORBA_SERVER_HEADER(SALOMEDS) #ifdef WNT -#include + #if defined TOOLSDS_EXPORTS + #if defined WIN32 + #define TOOLSDS_EXPORT __declspec( dllexport ) + #else + #define TOOLSDS_EXPORT + #endif + #else + #if defined WIN32 + #define TOOLSDS_EXPORT __declspec( dllimport ) + #else + #define TOOLSDS_EXPORT + #endif + #endif #else -#define SALOME_WNT_EXPORT + #define TOOLSDS_EXPORT #endif -class SALOME_WNT_EXPORT SALOMEDS_Tool +class TOOLSDS_EXPORT SALOMEDS_Tool { - public: // Returns the unique temporary directory, that is defined in SALOME_TMP_DIR if this variable is set diff --git a/src/Utils/OpUtil.hxx b/src/Utils/OpUtil.hxx index 7c3293b7c..7a681b830 100644 --- a/src/Utils/OpUtil.hxx +++ b/src/Utils/OpUtil.hxx @@ -27,19 +27,7 @@ #ifndef _OPUTIL_HXX #define _OPUTIL_HXX -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif +#include #include diff --git a/src/Utils/SalomeString.hxx b/src/Utils/SalomeString.hxx index 2f724aeb8..5f26104af 100644 --- a/src/Utils/SalomeString.hxx +++ b/src/Utils/SalomeString.hxx @@ -27,10 +27,12 @@ # ifndef SALOME_STRING # define SALOME_STRING +#include + # include # include -class SALOME_STRING : public string +class UTILS_EXPORT SALOME_STRING : public string { private : ostringstream _s ; diff --git a/src/Utils/Utils_CommException.hxx b/src/Utils/Utils_CommException.hxx index 388445bfc..1aff46ebc 100644 --- a/src/Utils/Utils_CommException.hxx +++ b/src/Utils/Utils_CommException.hxx @@ -29,6 +29,8 @@ # if !defined ( __Utils_CommException_H__ ) # define __Utils_CommException_H__ ) +#include + # include "Utils_SALOME_Exception.hxx" class UTILS_EXPORT CommException : public SALOME_Exception diff --git a/src/Utils/Utils_CorbaException.hxx b/src/Utils/Utils_CorbaException.hxx index c05e8e50a..a559579f1 100644 --- a/src/Utils/Utils_CorbaException.hxx +++ b/src/Utils/Utils_CorbaException.hxx @@ -29,6 +29,8 @@ #ifndef _UTILS_CORBAEXCEPTION_HXX_ #define _UTILS_CORBAEXCEPTION_HXX_ +#include + #include #include CORBA_SERVER_HEADER(SALOME_Exception) diff --git a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx index 68fb9ce6e..2d1685bd4 100644 --- a/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx +++ b/src/Utils/Utils_DESTRUCTEUR_GENERIQUE.hxx @@ -29,9 +29,11 @@ # if !defined( __DESTRUCTEUR_GENERIQUE__H__ ) # define __DESTRUCTEUR_GENERIQUE__H__ -# include +#include + +#include #include -# include +#include //# include "utilities.h" /*!\class DESTRUCTEUR_GENERIQUE_ @@ -55,29 +57,15 @@ * -# an object method to execute the destruction : operator()(). */ -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif - -class DESTRUCTEUR_GENERIQUE_ +class UTILS_EXPORT DESTRUCTEUR_GENERIQUE_ { public : - UTILS_EXPORT static std::list *Destructeurs; + static std::list *Destructeurs; virtual ~DESTRUCTEUR_GENERIQUE_() {}//!< virtual destructor - UTILS_EXPORT static const int Ajout( DESTRUCTEUR_GENERIQUE_ &objet );//!< adds a destruction object to the list of destructions - UTILS_EXPORT virtual void operator()( void )=0 ;//!< performs the destruction -} ; + static const int Ajout( DESTRUCTEUR_GENERIQUE_ &objet );//!< adds a destruction object to the list of destructions + virtual void operator()( void )=0 ;//!< performs the destruction +}; /*!\class DESTRUCTEUR_DE_ diff --git a/src/Utils/Utils_ExceptHandlers.hxx b/src/Utils/Utils_ExceptHandlers.hxx index 61b588055..8d9077cfd 100644 --- a/src/Utils/Utils_ExceptHandlers.hxx +++ b/src/Utils/Utils_ExceptHandlers.hxx @@ -29,21 +29,9 @@ #ifndef Utils_ExceptHandlers_HeaderFile #define Utils_ExceptHandlers_HeaderFile -#include +#include -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif +#include typedef void (*PVF)(); diff --git a/src/Utils/Utils_Identity.hxx b/src/Utils/Utils_Identity.hxx index 9dd4db080..3f0e57bbb 100644 --- a/src/Utils/Utils_Identity.hxx +++ b/src/Utils/Utils_Identity.hxx @@ -29,6 +29,8 @@ # if !defined( __IDENTITE_H__ ) # define __IDENTITE_H__ +#include + extern "C" { # include @@ -41,19 +43,6 @@ extern "C" #endif } -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif class UTILS_EXPORT Identity { diff --git a/src/Utils/Utils_Mutex.hxx b/src/Utils/Utils_Mutex.hxx index 0d692099d..a7e84123c 100644 --- a/src/Utils/Utils_Mutex.hxx +++ b/src/Utils/Utils_Mutex.hxx @@ -28,21 +28,9 @@ #ifndef Utils_Mutex_HeaderFile #define Utils_Mutex_HeaderFile -#include +#include -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif +#include class UTILS_EXPORT Utils_Mutex { diff --git a/src/Utils/Utils_ORB_INIT.hxx b/src/Utils/Utils_ORB_INIT.hxx index 345e2a292..49de8ec67 100644 --- a/src/Utils/Utils_ORB_INIT.hxx +++ b/src/Utils/Utils_ORB_INIT.hxx @@ -29,25 +29,12 @@ # if ! defined( __ORB_INIT_HXX__ ) # define __ORB_INIT_HXX__ +#include + # include "CORBA.h" #include "Utils_CommException.hxx" - -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif - /*! * Ce composant prend en charge la connexion et la deconnexion a l'orb * Il est souhaitable de l'utiliser dans un SINGLETON. diff --git a/src/Utils/Utils_SALOME_Exception.hxx b/src/Utils/Utils_SALOME_Exception.hxx index c870618aa..3a6676f12 100644 --- a/src/Utils/Utils_SALOME_Exception.hxx +++ b/src/Utils/Utils_SALOME_Exception.hxx @@ -29,25 +29,13 @@ #if !defined( __Utils_SALOME_Exception_hxx__ ) #define __Utils_SALOME_Exception_hxx__ +#include + # include # include # define LOCALIZED(message) #message , __FILE__ , __LINE__ -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif - class UTILS_EXPORT SALOME_Exception : public std::exception { diff --git a/src/Utils/Utils_SINGLETON.hxx b/src/Utils/Utils_SINGLETON.hxx index 8921e17b7..c04ae83e3 100644 --- a/src/Utils/Utils_SINGLETON.hxx +++ b/src/Utils/Utils_SINGLETON.hxx @@ -29,6 +29,8 @@ # if !defined( __SINGLETON__H__ ) # define __SINGLETON__H__ +#include + # include "Utils_DESTRUCTEUR_GENERIQUE.hxx" # include diff --git a/src/Utils/Utils_SignalsHandler.h b/src/Utils/Utils_SignalsHandler.h index 44228ba87..b1d0536ec 100644 --- a/src/Utils/Utils_SignalsHandler.h +++ b/src/Utils/Utils_SignalsHandler.h @@ -21,20 +21,7 @@ #ifndef _UTILS_SIGNALSHANDLER_H_ #define _UTILS_SIGNALSHANDLER_H_ - -#if defined UTILS_EXPORTS -#if defined WIN32 -#define UTILS_EXPORT __declspec( dllexport ) -#else -#define UTILS_EXPORT -#endif -#else -#if defined WNT -#define UTILS_EXPORT __declspec( dllimport ) -#else -#define UTILS_EXPORT -#endif -#endif +#include #include typedef void (*TSigHandler)(int); diff --git a/src/Utils/Utils_Timer.hxx b/src/Utils/Utils_Timer.hxx index 603323e4d..7c960c103 100644 --- a/src/Utils/Utils_Timer.hxx +++ b/src/Utils/Utils_Timer.hxx @@ -24,6 +24,8 @@ // File : Utils_Timer.hxx // Module : SALOME +#include + #include #include @@ -38,7 +40,7 @@ #define _POSIX_ #endif -class Utils_Timer { +class UTILS_EXPORT Utils_Timer { public: Utils_Timer(); virtual ~Utils_Timer(); -- 2.39.2