From 1315daac184d0d282fbf501dc59705f76edc25c0 Mon Sep 17 00:00:00 2001 From: abd Date: Sat, 1 Nov 2008 12:49:17 +0000 Subject: [PATCH] Fix compilation problem on Win32 platform: - export/import - surrounding by defined uncompilable parts --- src/Batch/Batch_BatchManager_eSGE.cxx | 9 ++++++++- src/Batch/Batch_BatchManager_eSGE.hxx | 3 ++- src/Batch/Batch_FactBatchManager_eSGE.hxx | 7 +++---- src/Batch/Batch_JobInfo_eSGE.hxx | 3 ++- 4 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/Batch/Batch_BatchManager_eSGE.cxx b/src/Batch/Batch_BatchManager_eSGE.cxx index 1835e32bf..28fb45f45 100644 --- a/src/Batch/Batch_BatchManager_eSGE.cxx +++ b/src/Batch/Batch_BatchManager_eSGE.cxx @@ -33,7 +33,12 @@ #include #include "Batch_BatchManager_eSGE.hxx" #include +#ifdef WIN32 +# include +# include +#else #include +#endif using namespace std; @@ -227,6 +232,8 @@ namespace Batch { void BatchManager_eSGE::buildBatchScript(const Job & job) throw(EmulationException) { +#ifndef WIN32 + //TODO porting on Win32 platform int status; Parametre params = job.getParametre(); Environnement env = job.getEnvironnement(); @@ -313,7 +320,7 @@ namespace Batch { throw EmulationException("Error of connection on remote host"); RmTmpFile(TmpFileName); - +#endif //WIN32 } std::string BatchManager_eSGE::getWallTime(const long edt) diff --git a/src/Batch/Batch_BatchManager_eSGE.hxx b/src/Batch/Batch_BatchManager_eSGE.hxx index 253ab5d42..8731041f1 100644 --- a/src/Batch/Batch_BatchManager_eSGE.hxx +++ b/src/Batch/Batch_BatchManager_eSGE.hxx @@ -30,6 +30,7 @@ #ifndef _BATCHMANAGER_eLSF_H_ #define _BATCHMANAGER_eLSF_H_ +#include "Batch_Defines.hxx" #include "Batch_JobId.hxx" #include "Batch_JobInfo.hxx" #include "Batch_JobInfo_eSGE.hxx" @@ -47,7 +48,7 @@ namespace Batch { class JobInfo; class FactBatchManager; - class BatchManager_eSGE : public BatchManager_eClient + class BATCH_EXPORT BatchManager_eSGE : public BatchManager_eClient { public: // Constructeur et destructeur diff --git a/src/Batch/Batch_FactBatchManager_eSGE.hxx b/src/Batch/Batch_FactBatchManager_eSGE.hxx index 212511752..f9d0cb12b 100644 --- a/src/Batch/Batch_FactBatchManager_eSGE.hxx +++ b/src/Batch/Batch_FactBatchManager_eSGE.hxx @@ -29,9 +29,8 @@ #ifndef _FACTBATCHMANAGER_eSGE_H_ #define _FACTBATCHMANAGER_eSGE_H_ -using namespace std; -#include -#include +#include "Batch_Defines.hxx" + #include "Batch_BatchManager_eClient.hxx" #include "Batch_FactBatchManager_eClient.hxx" @@ -39,7 +38,7 @@ namespace Batch { class BatchManager_eSGE; - class FactBatchManager_eSGE : public FactBatchManager_eClient + class BATCH_EXPORT FactBatchManager_eSGE : public FactBatchManager_eClient { public: // Constructeur et destructeur diff --git a/src/Batch/Batch_JobInfo_eSGE.hxx b/src/Batch/Batch_JobInfo_eSGE.hxx index 7ff889ec2..ee20ec4df 100644 --- a/src/Batch/Batch_JobInfo_eSGE.hxx +++ b/src/Batch/Batch_JobInfo_eSGE.hxx @@ -31,12 +31,13 @@ #define _JOBINFO_SGE_H_ #include +#include "Batch_Defines.hxx" #include "Batch_RunTimeException.hxx" #include "Batch_JobInfo.hxx" namespace Batch { - class JobInfo_eSGE : public JobInfo + class BATCH_EXPORT JobInfo_eSGE : public JobInfo { public: // Constructeurs et destructeur -- 2.39.2