From ee085d36a27c386141b61e9c7558f47911f28e65 Mon Sep 17 00:00:00 2001 From: barate Date: Wed, 23 Sep 2009 07:33:15 +0000 Subject: [PATCH] Fixed quotes in includes. Removed incomplete throw exception declaration. --- src/LSF/Batch_BatchManager_eLSF.hxx | 10 +++++----- src/LSF/Batch_FactBatchManager_eLSF.hxx | 6 +++--- src/Local/Batch_BatchManager_Local.cxx | 1 - src/Local/Batch_BatchManager_Local.hxx | 12 +++--------- src/Local/Batch_FactBatchManager_Local.hxx | 4 ++-- src/PBS/Batch_BatchManager_ePBS.hxx | 10 +++++----- src/SGE/Batch_BatchManager_eSGE.hxx | 10 +++++----- 7 files changed, 23 insertions(+), 30 deletions(-) diff --git a/src/LSF/Batch_BatchManager_eLSF.hxx b/src/LSF/Batch_BatchManager_eLSF.hxx index f4840d9..09a7f1c 100644 --- a/src/LSF/Batch_BatchManager_eLSF.hxx +++ b/src/LSF/Batch_BatchManager_eLSF.hxx @@ -32,11 +32,11 @@ #ifndef _BATCHMANAGER_ELSF_H_ #define _BATCHMANAGER_ELSF_H_ -#include -#include -#include -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_JobId.hxx" +#include "Batch_JobInfo.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager_eClient.hxx" namespace Batch { diff --git a/src/LSF/Batch_FactBatchManager_eLSF.hxx b/src/LSF/Batch_FactBatchManager_eLSF.hxx index dc6adbf..9144f64 100644 --- a/src/LSF/Batch_FactBatchManager_eLSF.hxx +++ b/src/LSF/Batch_FactBatchManager_eLSF.hxx @@ -31,9 +31,9 @@ #ifndef _FACTBATCHMANAGER_eLSF_H_ #define _FACTBATCHMANAGER_eLSF_H_ -#include -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_BatchManager_eClient.hxx" +#include "Batch_FactBatchManager_eClient.hxx" namespace Batch { diff --git a/src/Local/Batch_BatchManager_Local.cxx b/src/Local/Batch_BatchManager_Local.cxx index 1f95608..4166e3f 100644 --- a/src/Local/Batch_BatchManager_Local.cxx +++ b/src/Local/Batch_BatchManager_Local.cxx @@ -62,7 +62,6 @@ namespace Batch { // Constructeur BatchManager_Local::BatchManager_Local(const FactBatchManager * parent, const char * host, CommunicationProtocolType protocolType) - throw(InvalidArgumentException,ConnexionFailureException) : BatchManager(parent, host), _connect(0), _threads_mutex(), _threads(), _protocol(CommunicationProtocol::getInstance(protocolType)), _thread_id_id_association_mutex(), _thread_id_id_association_cond(), _thread_id_id_association() diff --git a/src/Local/Batch_BatchManager_Local.hxx b/src/Local/Batch_BatchManager_Local.hxx index c3c5e19..d6fc0f7 100644 --- a/src/Local/Batch_BatchManager_Local.hxx +++ b/src/Local/Batch_BatchManager_Local.hxx @@ -36,8 +36,8 @@ #ifndef _BATCHMANAGER_LOCAL_H_ #define _BATCHMANAGER_LOCAL_H_ -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_CommunicationProtocol.hxx" #ifdef WIN32 #include @@ -52,10 +52,6 @@ #include "Batch_JobInfo.hxx" #include "Batch_JobInfo_Local.hxx" #include "Batch_Job_Local.hxx" -#include "Batch_InvalidArgumentException.hxx" -#include "Batch_ConnexionFailureException.hxx" -#include "Batch_APIInternalFailureException.hxx" -#include "Batch_NotYetImplementedException.hxx" #include "Batch_BatchManager.hxx" namespace Batch { @@ -126,9 +122,7 @@ namespace Batch { // Constructeur et destructeur BatchManager_Local(const FactBatchManager * parent, const char * host="localhost", - CommunicationProtocolType protocolType = SSH) - throw(InvalidArgumentException, - ConnexionFailureException); // connexion a la machine host + CommunicationProtocolType protocolType = SSH); // connexion a la machine host virtual ~BatchManager_Local(); // Recupere le nom du serveur par defaut diff --git a/src/Local/Batch_FactBatchManager_Local.hxx b/src/Local/Batch_FactBatchManager_Local.hxx index 5b39d05..50dc1d4 100644 --- a/src/Local/Batch_FactBatchManager_Local.hxx +++ b/src/Local/Batch_FactBatchManager_Local.hxx @@ -35,8 +35,8 @@ #ifndef _FACTBATCHMANAGER_LOCAL_H_ #define _FACTBATCHMANAGER_LOCAL_H_ -#include -#include +#include "Batch_FactBatchManager.hxx" +#include "Batch_CommunicationProtocol.hxx" namespace Batch { diff --git a/src/PBS/Batch_BatchManager_ePBS.hxx b/src/PBS/Batch_BatchManager_ePBS.hxx index c9dfc6f..a2f9457 100644 --- a/src/PBS/Batch_BatchManager_ePBS.hxx +++ b/src/PBS/Batch_BatchManager_ePBS.hxx @@ -32,11 +32,11 @@ #ifndef _BATCHMANAGER_EPBS_H_ #define _BATCHMANAGER_EPBS_H_ -#include -#include -#include -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_JobId.hxx" +#include "Batch_JobInfo.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager_eClient.hxx" namespace Batch { diff --git a/src/SGE/Batch_BatchManager_eSGE.hxx b/src/SGE/Batch_BatchManager_eSGE.hxx index 2273a18..008fb38 100644 --- a/src/SGE/Batch_BatchManager_eSGE.hxx +++ b/src/SGE/Batch_BatchManager_eSGE.hxx @@ -32,11 +32,11 @@ #ifndef _BATCHMANAGER_ESGE_H_ #define _BATCHMANAGER_ESGE_H_ -#include -#include -#include -#include -#include +#include "Batch_Defines.hxx" +#include "Batch_JobId.hxx" +#include "Batch_JobInfo.hxx" +#include "Batch_FactBatchManager.hxx" +#include "Batch_BatchManager_eClient.hxx" namespace Batch { -- 2.39.2