From 84a75a290079392e382de1b5288d1a504b3dd58c Mon Sep 17 00:00:00 2001
From: caremoli <caremoli>
Date: Wed, 8 Oct 2008 18:20:27 +0000
Subject: [PATCH] CCAR: compilation with LSF has not been tested

---
 src/Batch/Batch_BatchManager_LSF.cxx | 3 +++
 src/Batch/Batch_JobInfo_LSF.cxx      | 3 +++
 src/Batch/Batch_JobInfo_LSF.hxx      | 6 +++---
 src/Batch/Batch_Job_LSF.cxx          | 4 +++-
 src/Batch/Batch_Job_LSF.hxx          | 3 ++-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/Batch/Batch_BatchManager_LSF.cxx b/src/Batch/Batch_BatchManager_LSF.cxx
index 301f2eeb0..29f17e21e 100644
--- a/src/Batch/Batch_BatchManager_LSF.cxx
+++ b/src/Batch/Batch_BatchManager_LSF.cxx
@@ -34,8 +34,11 @@ extern "C" {
 #include <iostream>
 #include <fstream>
 #include <sstream>
+#include <string>
 #include "Batch_BatchManager_LSF.hxx"
 
+using namespace std;
+
 namespace Batch {
 
   BatchManager_LSF::BatchManager_LSF(const FactBatchManager * parent, const char * host) throw(InvalidArgumentException,ConnexionFailureException) : BatchManager(parent, host)
diff --git a/src/Batch/Batch_JobInfo_LSF.cxx b/src/Batch/Batch_JobInfo_LSF.cxx
index 2ae986cd0..79f5d3807 100644
--- a/src/Batch/Batch_JobInfo_LSF.cxx
+++ b/src/Batch/Batch_JobInfo_LSF.cxx
@@ -29,12 +29,15 @@
 
 #include <cstdio>
 #include <sstream>
+#include <string>
 #include "Batch_Parametre.hxx"
 #include "Batch_Environnement.hxx"
 #include "Batch_RunTimeException.hxx"
 #include "Batch_APIInternalFailureException.hxx"
 #include "Batch_JobInfo_LSF.hxx"
 
+using namespace std;
+
 namespace Batch {
 
 
diff --git a/src/Batch/Batch_JobInfo_LSF.hxx b/src/Batch/Batch_JobInfo_LSF.hxx
index 7ba666211..1edb2e52d 100644
--- a/src/Batch/Batch_JobInfo_LSF.hxx
+++ b/src/Batch/Batch_JobInfo_LSF.hxx
@@ -57,15 +57,15 @@ namespace Batch {
 
     // Methodes pour l'interfacage avec Python (SWIG)
     // TODO : supprimer ces methodes et transferer leur definitions dans SWIG
-    string  __str__() const; // SWIG : affichage en Python
-    string  __repr__() const { return __str__(); }; // SWIG : affichage en Python
+    std::string  __str__() const; // SWIG : affichage en Python
+    std::string  __repr__() const { return __str__(); }; // SWIG : affichage en Python
 
   protected:
     bool _running; // etat du job en machine
 
   private:
     // Convertit une date HH:MM:SS en secondes
-    long HMStoLong(const string &);
+    long HMStoLong(const std::string &);
 
   };
 
diff --git a/src/Batch/Batch_Job_LSF.cxx b/src/Batch/Batch_Job_LSF.cxx
index 549d4ab36..2d99df052 100644
--- a/src/Batch/Batch_Job_LSF.cxx
+++ b/src/Batch/Batch_Job_LSF.cxx
@@ -30,10 +30,12 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <string.h>
+#include <string>
 #include <vector>
 #include "Batch_Job_LSF.hxx"
 
+using namespace std;
+
 namespace Batch {
 
 
diff --git a/src/Batch/Batch_Job_LSF.hxx b/src/Batch/Batch_Job_LSF.hxx
index 0de536514..9bc07fa1b 100644
--- a/src/Batch/Batch_Job_LSF.hxx
+++ b/src/Batch/Batch_Job_LSF.hxx
@@ -35,6 +35,7 @@ extern "C" {
 #include <lsf/lsf.h>
 #include <lsf/lsbatch.h>
 }
+#include <string>
 #include "Batch_Job.hxx"
 
 namespace Batch {
@@ -54,7 +55,7 @@ namespace Batch {
 
   private:
     struct submit * ParametreToSubmitStruct(const Parametre & P);
-    char * string2char(const string &);
+    char * string2char(const std::string &);
   };
 
 }
-- 
2.39.2