Merge class BatchManager_eClient into class BatchManager

[tools/libbatch.git] / src / Slurm / Batch_FactBatchManager_eSlurm.cxx

diff --git a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx b/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
index 36a217ad004876f7bae7bdfb14639324c35b5507..9fd77abf488a63c0af22857dffc5d441e2279a0c 100644 (file)
--- a/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
+++ b/src/Slurm/Batch_FactBatchManager_eSlurm.cxx
@@ -35,7 +35,7 @@ namespace Batch {
 
   static FactBatchManager_eSlurm sFBM_eSlurm;
 
-  FactBatchManager_eSlurm::FactBatchManager_eSlurm() : FactBatchManager_eClient("eSLURM")
+  FactBatchManager_eSlurm::FactBatchManager_eSlurm() : FactBatchManager("SLURM")
   {
   }
 
@@ -43,19 +43,12 @@ namespace Batch {
   {
   }
 
-  BatchManager * FactBatchManager_eSlurm::operator() (const char * hostname) const
+  BatchManager * FactBatchManager_eSlurm::operator() (const char * hostname,
+                                                      const char * username,
+                                                      CommunicationProtocolType protocolType,
+                                                      const char * mpiImpl,
+                                                      int nb_proc_per_node) const
   {
-    // MESSAGE("Building new BatchManager_eSlurm on host '" << hostname << "'");
-    return new BatchManager_eSlurm(this, hostname);
-  }
-
-  BatchManager_eClient * FactBatchManager_eSlurm::operator() (const char * hostname,
-                                                              const char * username,
-                                                              CommunicationProtocolType protocolType,
-                                                              const char * mpiImpl,
-                                                              int nb_proc_per_node) const
-  {
-    // MESSAGE("Building new BatchManager_eSlurm on host '" << hostname << "'");
     return new BatchManager_eSlurm(this, hostname, username, protocolType, mpiImpl, nb_proc_per_node);
   }