Merge class BatchManager_eClient into class BatchManager

[tools/libbatch.git] / src / LoadLeveler / Batch_FactBatchManager_eLL.hxx

diff --git a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
index ba6cc48ba058505abebc2a340a5141cb96661fd4..4d6d591ec4dfbb24440d8fa61fc178c0fe916c46 100644 (file)
--- a/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
+++ b/src/LoadLeveler/Batch_FactBatchManager_eLL.hxx
@@ -1,4 +1,4 @@
-//  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
+//  Copyright (C) 2007-2012  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 //  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 //  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -32,8 +32,8 @@
 #include <Batch_Defines.hxx>
 #include <Batch_Constants.hxx>
 
-#include "Batch_BatchManager_eClient.hxx"
-#include "Batch_FactBatchManager_eClient.hxx"
+#include "Batch_BatchManager.hxx"
+#include "Batch_FactBatchManager.hxx"
 
 namespace Batch {
 
@@ -41,20 +41,18 @@ namespace Batch {
 
   class BatchManager_eLL;
 
-  class BATCH_EXPORT FactBatchManager_eLL : public FactBatchManager_eClient
+  class BATCH_EXPORT FactBatchManager_eLL : public FactBatchManager
   {
   public:
     // Constructeur et destructeur
     FactBatchManager_eLL();
     virtual ~FactBatchManager_eLL();
 
-    virtual BatchManager * operator() (const char * hostname) const;
-    virtual BatchManager_eClient * operator() (const char * hostname,
-                                               const char * username,
-                                               CommunicationProtocolType protocolType,
-                                               const char * mpiImpl,
-                                               int nb_proc_per_node = 1) const;
-
+    virtual BatchManager * operator() (const char * hostname,
+                                       const char * username,
+                                       CommunicationProtocolType protocolType,
+                                       const char * mpiImpl,
+                                       int nb_proc_per_node = 1) const;
   };
 
 }