From a534ca6b48a6face8ab48cc7bfc6cdedc817acb7 Mon Sep 17 00:00:00 2001 From: env Date: Fri, 9 Sep 2005 05:09:15 +0000 Subject: [PATCH] ENV: Windows porting. --- src/Communication/MultiCommException.hxx | 7 ++++++- src/Communication/SALOMEMultiComm.hxx | 8 +++++++- src/Communication/SenderFactory.hxx | 8 +++++++- src/Container/SALOME_Container.cxx | 2 ++ 4 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/Communication/MultiCommException.hxx b/src/Communication/MultiCommException.hxx index fe029fc4a..6313ab5e4 100644 --- a/src/Communication/MultiCommException.hxx +++ b/src/Communication/MultiCommException.hxx @@ -3,8 +3,13 @@ #include +#if defined WNT && defined COMMUNICATION_EXPORTS +#define COMMUNICATION_EXPORT __declspec( dllexport ) +#else +#define COMMUNICATION_EXPORT +#endif -class MultiCommException { +class COMMUNICATION_EXPORT MultiCommException { private: std::string _message; public: diff --git a/src/Communication/SALOMEMultiComm.hxx b/src/Communication/SALOMEMultiComm.hxx index 2537dc042..8c46251af 100644 --- a/src/Communication/SALOMEMultiComm.hxx +++ b/src/Communication/SALOMEMultiComm.hxx @@ -4,11 +4,17 @@ #include #include CORBA_SERVER_HEADER(SALOME_Comm) +#if defined WNT && defined COMMUNICATION_EXPORTS +#define COMMUNICATION_EXPORT __declspec( dllexport ) +#else +#define COMMUNICATION_EXPORT +#endif + /*! 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/SenderFactory.hxx b/src/Communication/SenderFactory.hxx index ce3a0ad91..39edaa3a1 100644 --- a/src/Communication/SenderFactory.hxx +++ b/src/Communication/SenderFactory.hxx @@ -5,6 +5,12 @@ #include #include CORBA_SERVER_HEADER(SALOME_Comm) +#if defined WNT && defined COMMUNICATION_EXPORTS +#define COMMUNICATION_EXPORT __declspec( dllexport ) +#else +#define COMMUNICATION_EXPORT +#endif + class SALOMEMultiComm; class SALOME_SenderDouble_i; @@ -13,7 +19,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/SALOME_Container.cxx b/src/Container/SALOME_Container.cxx index 451523f29..02a870587 100644 --- a/src/Container/SALOME_Container.cxx +++ b/src/Container/SALOME_Container.cxx @@ -105,9 +105,11 @@ int main(int argc, char* argv[]) PortableServer::POAManager_var pman = root_poa->the_POAManager(); // add new container to the kill list +#ifndef WNT char aCommand[40]; sprintf(aCommand, "addToKillList.py %d SALOME_Container", getpid()); system(aCommand); +#endif Engines_Container_i * myContainer = new Engines_Container_i(orb, root_poa, containerName , argc , argv ); -- 2.39.2