Merge class BatchManager_eClient into class BatchManager

[tools/libbatch.git] / src / CCC / Batch_FactBatchManager_eCCC.cxx

diff --git a/src/CCC/Batch_FactBatchManager_eCCC.cxx b/src/CCC/Batch_FactBatchManager_eCCC.cxx
index 080d89f726d0f4ca48c86253b611d89d14541662..878d9803620aa665b2e04354936ce691c261573d 100644 (file)
--- a/src/CCC/Batch_FactBatchManager_eCCC.cxx
+++ b/src/CCC/Batch_FactBatchManager_eCCC.cxx
@@ -36,7 +36,7 @@ namespace Batch {
   static FactBatchManager_eCCC sFBM_eCCC;
 
   // Constructeur
-  FactBatchManager_eCCC::FactBatchManager_eCCC() : FactBatchManager_eClient("eCCC")
+  FactBatchManager_eCCC::FactBatchManager_eCCC() : FactBatchManager("CCC")
   {
     // Nothing to do
   }
@@ -47,18 +47,11 @@ namespace Batch {
     // Nothing to do
   }
 
-  // Functor
-  BatchManager * FactBatchManager_eCCC::operator() (const char * hostname) const
-  {
-    // MESSAGE("Building new BatchManager_CCC on host '" << hostname << "'");
-    return new BatchManager_eCCC(this, hostname);
-  }
-
-  BatchManager_eClient * FactBatchManager_eCCC::operator() (const char * hostname,
-                                                            const char * username,
-                                                            CommunicationProtocolType protocolType,
-                                                            const char * mpiImpl,
-                                                           int nb_proc_per_node) const
+  BatchManager * FactBatchManager_eCCC::operator() (const char * hostname,
+                                                    const char * username,
+                                                    CommunicationProtocolType protocolType,
+                                                    const char * mpiImpl,
+                                                    int nb_proc_per_node) const
   {
     // MESSAGE("Building new BatchManager_CCC on host '" << hostname << "'");
     return new BatchManager_eCCC(this, hostname, username, protocolType, mpiImpl);