PR: oublis portage CCRT : deplacement using namspace std

diff --git a/src/Batch/Batch_APIInternalFailureException.hxx b/src/Batch/Batch_APIInternalFailureException.hxx
index 14bf01f4faf157b421396c7e6676eb9c707c920b..946851c598cb037945ee9e4de9475c3b75d93e84 100644 (file)
--- a/src/Batch/Batch_APIInternalFailureException.hxx
+++ b/src/Batch/Batch_APIInternalFailureException.hxx
@@ -21,7 +21,7 @@ namespace Batch {
   {
   public:
                // Constructeur
-    APIInternalFailureException(string ch = "undefined") : GenericException("APIInternalFailureException", ch) {}
+    APIInternalFailureException(std::string ch = "undefined") : GenericException("APIInternalFailureException", ch) {}
   };
 
 }

diff --git a/src/Batch/Batch_Couple.hxx b/src/Batch/Batch_Couple.hxx
index e60b75b4b0bfa89240f9c0d88c315ee26b66d84c..cd310b4c61d15612e651366f76785c37da4314de 100644 (file)
--- a/src/Batch/Batch_Couple.hxx
+++ b/src/Batch/Batch_Couple.hxx
@@ -25,7 +25,7 @@ namespace Batch {
     Couple(const Couple & C) : _local(C._local), _remote(C._remote) {}
 
     // Operateur pour l'affichage sur un stream
-    friend ostream & operator << (ostream & os, const Couple & cp);
+    friend std::ostream & operator << (std::ostream & os, const Couple & cp);
 
     // Operateur d'affectation
     virtual Couple & operator =(const Couple &);

diff --git a/src/Batch/Batch_InvalidArgumentException.hxx b/src/Batch/Batch_InvalidArgumentException.hxx
index 62a972bd40a77e9e82ba5e6644ce6e42e5380a62..9f83ba9d7e91f0d7a281704245a43d4dc3733f9f 100644 (file)
--- a/src/Batch/Batch_InvalidArgumentException.hxx
+++ b/src/Batch/Batch_InvalidArgumentException.hxx
@@ -21,7 +21,7 @@ namespace Batch {
   {
   public:
                // Constructeur
-    InvalidArgumentException(string ch = "undefined") : GenericException("InvalidArgumentException", ch) {}
+    InvalidArgumentException(std::string ch = "undefined") : GenericException("InvalidArgumentException", ch) {}
   };
 
 }

diff --git a/src/Batch/Batch_JobInfo_PBS.hxx b/src/Batch/Batch_JobInfo_PBS.hxx
index 9010e2356f25cd8f032ed39f4d0d37cd2bf9d117..4ae535c96e55b51d219a6dbb6ff559f21c404e78 100644 (file)
--- a/src/Batch/Batch_JobInfo_PBS.hxx
+++ b/src/Batch/Batch_JobInfo_PBS.hxx
@@ -42,7 +42,7 @@ namespace Batch {
 
   private:
     // Convertit une date HH:MM:SS en secondes
-    long HMStoLong(const string &);
+    long HMStoLong(const std::string &);
 
   };
 

diff --git a/src/Batch/Batch_LongType.cxx b/src/Batch/Batch_LongType.cxx
index 2bd92c6c09f97c8b83e7fa79e418044383778d28..6a7c10038f8dad984fd530a7d9b8fba2cdbe12c1 100644 (file)
--- a/src/Batch/Batch_LongType.cxx
+++ b/src/Batch/Batch_LongType.cxx
@@ -11,6 +11,7 @@
 #include <sstream>
 //#include "MEDMEM_STRING.hxx"
 #include "Batch_LongType.hxx"
+using namespace std;
 
 namespace Batch {
 

diff --git a/src/Batch/Batch_Parametre.cxx b/src/Batch/Batch_Parametre.cxx
index fb8605c1b8bd1e83d8a37c7e1bad0a63743ad520..47547061faa11aef144f1087a3e4cb11c988c3f6 100644 (file)
--- a/src/Batch/Batch_Parametre.cxx
+++ b/src/Batch/Batch_Parametre.cxx
@@ -11,6 +11,7 @@
 #include "Batch_Versatile.hxx"
 #include "Batch_InvalidKeyException.hxx"
 #include "Batch_Parametre.hxx"
+using namespace std;
 
 // Definition des membres constants statiques
 // Definition des noms globaux pour les clefs en tant que references

diff --git a/src/Batch/Batch_Versatile.hxx b/src/Batch/Batch_Versatile.hxx
index 98d45c14a3503988e943fbd1ac40073f349a3a40..d1a397ef75e2224dd1105611253d8e5ffcd47289 100644 (file)
--- a/src/Batch/Batch_Versatile.hxx
+++ b/src/Batch/Batch_Versatile.hxx
@@ -63,7 +63,7 @@ namespace Batch {
 
                // Conversion de type vers un type de "base"
     operator long() const throw(TypeMismatchException);
-    operator string() const throw(TypeMismatchException);
+    operator std::string() const throw(TypeMismatchException);
     operator Couple() const throw(TypeMismatchException);
     std::string str() const throw(TypeMismatchException);
 
@@ -79,7 +79,7 @@ namespace Batch {
                int getMaxSize() const { return _maxsize; }
 
                // Positionnement et recuperation du nom de l'objet
-    string getName() const;
+    std::string getName() const;
     void setName(const std::string & name);
 
   protected: