Removed some warnings

diff --git a/src/CCC/Batch_BatchManager_eCCC.cxx b/src/CCC/Batch_BatchManager_eCCC.cxx
index 65f5df08a96d2d0c7d3665fbc8d96796884f1d78..8ba7597a46a997f467672647194c984aa337067c 100644 (file)
--- 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 5b992b8b4bf5bebbe82440ca74d9f51cf7b382f2..4938070e52025cf320e2780eeb50512b33174485 100644 (file)
--- 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 7e0c0b040116c6153d467456bcf5b9ae5ae01a0b..59e79a10746e4bd0709c1349fdb906b896de1876 100644 (file)
--- 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 05ce5b04ddf6dc739d40d89c224cf4efff2ea14e..fdc90b1494ef79845710b82aab61763853f005dd 100644 (file)
--- 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 4d3b60550d8ccad70ccc1747e48dbeee364ffabf..12f79eb60b21a789f51a6f4425278b4eb644166c 100644 (file)
--- 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 20d5c4b5baede809fbf9a9366e8b6758a1065125..4f0d305ce6cc6699be632a204d6d649fc1ad1640 100644 (file)
--- 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 1d49e032b89407a19027180360bc6de3dfb4e4aa..2d184afd59e57a45f4ed64b4fbdcd82352182ceb 100644 (file)
--- 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
   }