From d894cfb07865aeb91ae5ee31cd9e36a187fc4f42 Mon Sep 17 00:00:00 2001 From: abd Date: Fri, 3 Oct 2008 09:09:31 +0000 Subject: [PATCH] Win32 Porting. Correction of Export/Import defines for Win32 platform. Using WIN32 standard define instead WNT define of OpenCascade library. --- src/Batch_SWIG/libBatch_Swig.i | 2 ++ src/Communication/SALOMEMultiComm.cxx | 2 -- src/Communication/SALOME_Comm_i.cxx | 4 ++-- src/Communication/SALOME_Comm_i.hxx | 14 +++++++------- src/Communication/SALOME_Communication.hxx | 22 +++++++--------------- 5 files changed, 18 insertions(+), 26 deletions(-) diff --git a/src/Batch_SWIG/libBatch_Swig.i b/src/Batch_SWIG/libBatch_Swig.i index 255d107dc..4bf0acae6 100644 --- a/src/Batch_SWIG/libBatch_Swig.i +++ b/src/Batch_SWIG/libBatch_Swig.i @@ -51,6 +51,7 @@ %include libBatch_Swig_exception.i %{ +#include "Batch_Defines.hxx" #include "Batch_Job.hxx" #include "Batch_JobId.hxx" #include "Batch_JobInfo.hxx" @@ -61,6 +62,7 @@ %} /* Les classes exportees en Python */ +%include Batch_Defines.hxx %include Batch_Job.hxx %include Batch_JobId.hxx %include Batch_JobInfo.hxx diff --git a/src/Communication/SALOMEMultiComm.cxx b/src/Communication/SALOMEMultiComm.cxx index 823639296..31e3f1efe 100644 --- a/src/Communication/SALOMEMultiComm.cxx +++ b/src/Communication/SALOMEMultiComm.cxx @@ -18,9 +18,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SALOMEMultiComm.hxx" -#ifndef WNT using namespace std; -#endif SALOMEMultiComm::SALOMEMultiComm():_type(SALOME::CORBA_) { diff --git a/src/Communication/SALOME_Comm_i.cxx b/src/Communication/SALOME_Comm_i.cxx index 02f7e68fd..1aeed449c 100644 --- a/src/Communication/SALOME_Comm_i.cxx +++ b/src/Communication/SALOME_Comm_i.cxx @@ -18,7 +18,7 @@ // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // #include "SALOME_Comm_i.hxx" -#ifndef WNT +#ifndef WIN32 #include #endif #include "omniORB4/poa.h" @@ -30,7 +30,7 @@ #include "SenderFactory.hxx" using namespace std; -#ifndef WNT +#ifndef WIN32 CORBA::ORB_var &getGlobalORB(){ ORB_INIT &init = *SINGLETON_::Instance(); CORBA::ORB_var &orb = init(0,0); diff --git a/src/Communication/SALOME_Comm_i.hxx b/src/Communication/SALOME_Comm_i.hxx index 6664fc4c0..6de8d596c 100644 --- a/src/Communication/SALOME_Comm_i.hxx +++ b/src/Communication/SALOME_Comm_i.hxx @@ -130,7 +130,7 @@ public: ~SALOME_CorbaLongCSender_i(); CORBA::ULong getSize(); SALOME::vectorOfLong* sendPart(CORBA::ULong offset, CORBA::ULong length); -#ifndef WNT +#ifndef WIN32 SALOME::CorbaLongCSender_ptr _this(); #endif }; @@ -161,7 +161,7 @@ private: /*! Type the component of the array*/ SALOME::TypeOfDataTransmitted _type; public: - SALOME_MPISender_i(const void *tabToSend,long lgrTabToSend,int sizeOf,bool ownTabToSend=false); + SALOME_MPISender_i(const void *tabToSend,long lgrTabToSend,int sizeOf,bool owntabToSend=false); ~SALOME_MPISender_i(); SALOME::MPISender::param* getParam(); void send(); @@ -175,7 +175,7 @@ class COMMUNICATION_EXPORT SALOME_MPISenderDouble_i : public POA_SALOME::MPISend public SALOME_MPISender_i { public: - SALOME_MPISenderDouble_i(const double *tabToSend,long lgrTabToSend,bool ownTabToSend=false); + SALOME_MPISenderDouble_i(const double *tabToSend,long lgrTabToSend,bool oWNTabToSend=false); }; class COMMUNICATION_EXPORT SALOME_MPISenderInt_i : public POA_SALOME::MPISenderInt, @@ -183,7 +183,7 @@ class COMMUNICATION_EXPORT SALOME_MPISenderInt_i : public POA_SALOME::MPISenderI public SALOME_MPISender_i { public: - SALOME_MPISenderInt_i(const int *tabToSend,long lgrTabToSend,bool ownTabToSend=false); + SALOME_MPISenderInt_i(const int *tabToSend,long lgrTabToSend,bool owntabToSend=false); }; #endif @@ -206,7 +206,7 @@ private: /*! Type the component of the array*/ SALOME::TypeOfDataTransmitted _type; public: - SALOME_SocketSender_i(const void *tabToSend,long lgrTabToSend,int sizeOf,bool ownTabToSend=false); + SALOME_SocketSender_i(const void *tabToSend,long lgrTabToSend,int sizeOf,bool owntabToSend=false); ~SALOME_SocketSender_i(); SALOME::SocketSender::param* getParam(); void send(); @@ -224,7 +224,7 @@ class COMMUNICATION_EXPORT SALOME_SocketSenderDouble_i : public POA_SALOME::Sock public SALOME_SocketSender_i { public: - SALOME_SocketSenderDouble_i(const double *tabToSend,long lgrTabToSend,bool ownTabToSend=false); + SALOME_SocketSenderDouble_i(const double *tabToSend,long lgrTabToSend,bool owntabToSend=false); }; class COMMUNICATION_EXPORT SALOME_SocketSenderInt_i : public POA_SALOME::SocketSenderInt, @@ -232,7 +232,7 @@ class COMMUNICATION_EXPORT SALOME_SocketSenderInt_i : public POA_SALOME::SocketS public SALOME_SocketSender_i { public: - SALOME_SocketSenderInt_i(const int *tabToSend,long lgrTabToSend,bool ownTabToSend=false); + SALOME_SocketSenderInt_i(const int *tabToSend,long lgrTabToSend,bool owntabToSend=false); }; #endif diff --git a/src/Communication/SALOME_Communication.hxx b/src/Communication/SALOME_Communication.hxx index 93c11cc56..bc92ee00c 100755 --- a/src/Communication/SALOME_Communication.hxx +++ b/src/Communication/SALOME_Communication.hxx @@ -26,22 +26,14 @@ #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 +#ifdef WIN32 +# ifdef COMMUNICATION_EXPORTS +# define COMMUNICATION_EXPORT __declspec( dllexport ) +# else +# define COMMUNICATION_EXPORT __declspec( dllimport ) +# endif #else - #define COMMUNICATION_EXPORT +# define COMMUNICATION_EXPORT #endif #endif -- 2.39.2