Merge from BR_LIBBATCH_2_0

[modules/jobmanager.git] / src / engine / BL_SALOMEServices.hxx

diff --git a/src/engine/BL_SALOMEServices.hxx b/src/engine/BL_SALOMEServices.hxx
index f3500cc06e0f0854572a6046c4f3bf7c73bd424f..217fd64bd6409c331a29f66818bcc84abe095a6c 100644 (file)
--- a/src/engine/BL_SALOMEServices.hxx
+++ b/src/engine/BL_SALOMEServices.hxx
@@ -58,7 +58,8 @@ namespace BL{
     std::string mpiImpl;
     std::string iprotocol;
 
-    bool is_cluster_head;
+    bool can_launch_batch_jobs;
+    bool can_run_containers;
     std::string working_directory;
   };
 
@@ -74,7 +75,7 @@ namespace BL{
 
       void set_manager(BL::JobsManager * manager) {_manager = manager;}
 
-      std::list<std::string> getResourceList();
+      std::list<std::string> getResourceList(bool batch_only);
       BL::ResourceDescr getResourceDescr(const std::string& name);
       void addResource(BL::ResourceDescr & new_resource);
       void removeResource(const std::string & name);