From d3c7d7bc38fcfcb3f92a582f012421931c6e8b7a Mon Sep 17 00:00:00 2001 From: barate Date: Tue, 1 Feb 2011 16:49:18 +0000 Subject: [PATCH] Removed some warnings --- src/CCC/Batch_BatchManager_eCCC.cxx | 4 ++-- src/LSF/Batch_BatchManager_eLSF.cxx | 5 +++-- src/Local/Batch_BatchManager_Local.cxx | 5 +---- src/PBS/Batch_BatchManager_PBS.cxx | 4 ++-- src/PBS/Batch_BatchManager_ePBS.cxx | 6 +++--- src/SGE/Batch_BatchManager_eSGE.cxx | 4 ++-- src/SSH/Batch_BatchManager_eSSH.cxx | 6 +++--- 7 files changed, 16 insertions(+), 18 deletions(-) diff --git a/src/CCC/Batch_BatchManager_eCCC.cxx b/src/CCC/Batch_BatchManager_eCCC.cxx index 65f5df0..8ba7597 100644 --- a/src/CCC/Batch_BatchManager_eCCC.cxx +++ b/src/CCC/Batch_BatchManager_eCCC.cxx @@ -57,8 +57,8 @@ namespace Batch { BatchManager_eCCC::BatchManager_eCCC(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) - : BatchManager_eClient(parent, host, username, protocolType, mpiImpl), - BatchManager(parent, host) + : BatchManager(parent, host), + BatchManager_eClient(parent, host, username, protocolType, mpiImpl) { // Nothing to do } diff --git a/src/LSF/Batch_BatchManager_eLSF.cxx b/src/LSF/Batch_BatchManager_eLSF.cxx index 5b992b8..4938070 100644 --- a/src/LSF/Batch_BatchManager_eLSF.cxx +++ b/src/LSF/Batch_BatchManager_eLSF.cxx @@ -57,8 +57,9 @@ namespace Batch { BatchManager_eLSF::BatchManager_eLSF(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) - : BatchManager_eClient(parent, host, username, protocolType, mpiImpl), - BatchManager(parent, host) + : BatchManager(parent, host), + BatchManager_eClient(parent, host, username, protocolType, mpiImpl) + { // Nothing to do } diff --git a/src/Local/Batch_BatchManager_Local.cxx b/src/Local/Batch_BatchManager_Local.cxx index 7e0c0b0..59e79a1 100644 --- a/src/Local/Batch_BatchManager_Local.cxx +++ b/src/Local/Batch_BatchManager_Local.cxx @@ -137,9 +137,6 @@ namespace Batch { istringstream iss(jobid.getReference()); iss >> id; - // On retrouve le thread_id du thread - pthread_t thread_id; - // @@@ --------> SECTION CRITIQUE <-------- @@@ pthread_mutex_lock(&_threads_mutex); bool idFound = (_threads.find(id) != _threads.end()); @@ -807,7 +804,7 @@ namespace Batch { // On execute la commande du fils - int result = execve(argv[0], argv, envp); + execve(argv[0], argv, envp); UNDER_LOCK( cout << "*** debug_command = " << strerror(errno) << endl ); // No need to deallocate since nothing happens after a successful exec diff --git a/src/PBS/Batch_BatchManager_PBS.cxx b/src/PBS/Batch_BatchManager_PBS.cxx index 05ce5b0..fdc90b1 100644 --- a/src/PBS/Batch_BatchManager_PBS.cxx +++ b/src/PBS/Batch_BatchManager_PBS.cxx @@ -157,7 +157,7 @@ namespace Batch { void BatchManager_PBS::holdJob(const JobId & jobid) { char * ref = const_cast< char * >(jobid.getReference().c_str()); - int rc = pbs_holdjob(_connect, ref, USER_HOLD, 0); + int rc = pbs_holdjob(_connect, ref, const_cast< char * >(USER_HOLD), 0); if (rc) { // si erreur throw APIInternalFailureException(getErrorMessage("holdjob").c_str()); } @@ -167,7 +167,7 @@ namespace Batch { void BatchManager_PBS::releaseJob(const JobId & jobid) { char * ref = const_cast< char * >(jobid.getReference().c_str()); - int rc = pbs_rlsjob(_connect, ref, USER_HOLD, 0); + int rc = pbs_rlsjob(_connect, ref, const_cast< char * >(USER_HOLD), 0); if (rc) { // si erreur throw APIInternalFailureException(getErrorMessage("rlsjob").c_str()); } diff --git a/src/PBS/Batch_BatchManager_ePBS.cxx b/src/PBS/Batch_BatchManager_ePBS.cxx index 4d3b605..12f79eb 100644 --- a/src/PBS/Batch_BatchManager_ePBS.cxx +++ b/src/PBS/Batch_BatchManager_ePBS.cxx @@ -57,9 +57,9 @@ namespace Batch { BatchManager_ePBS::BatchManager_ePBS(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl, - int nb_proc_per_node) - : BatchManager_eClient(parent, host, username, protocolType, mpiImpl), - BatchManager(parent, host) + int nb_proc_per_node) + : BatchManager(parent, host), + BatchManager_eClient(parent, host, username, protocolType, mpiImpl) { // Nothing to do _nb_proc_per_node = nb_proc_per_node; diff --git a/src/SGE/Batch_BatchManager_eSGE.cxx b/src/SGE/Batch_BatchManager_eSGE.cxx index 20d5c4b..4f0d305 100644 --- a/src/SGE/Batch_BatchManager_eSGE.cxx +++ b/src/SGE/Batch_BatchManager_eSGE.cxx @@ -56,8 +56,8 @@ namespace Batch { BatchManager_eSGE::BatchManager_eSGE(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) - : BatchManager_eClient(parent, host, username, protocolType, mpiImpl), - BatchManager(parent, host) + : BatchManager(parent, host), + BatchManager_eClient(parent, host, username, protocolType, mpiImpl) { // Nothing to do } diff --git a/src/SSH/Batch_BatchManager_eSSH.cxx b/src/SSH/Batch_BatchManager_eSSH.cxx index 1d49e03..2d184af 100644 --- a/src/SSH/Batch_BatchManager_eSSH.cxx +++ b/src/SSH/Batch_BatchManager_eSSH.cxx @@ -51,9 +51,9 @@ namespace Batch { BatchManager_eSSH::BatchManager_eSSH(const FactBatchManager * parent, const char * host, const char * username, CommunicationProtocolType protocolType, const char * mpiImpl) - : BatchManager_eClient(parent, host, username, protocolType, mpiImpl), - BatchManager_Local(parent, host, protocolType), - BatchManager(parent, host) + : BatchManager(parent, host), + BatchManager_eClient(parent, host, username, protocolType, mpiImpl), + BatchManager_Local(parent, host, protocolType) { // Nothing to do } -- 2.39.2