From: prascle Date: Tue, 9 Nov 2004 09:41:46 +0000 (+0000) Subject: PR: oublis portage CCRT : deplacement using namspace std X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5f93c59acb28e10fe36a585e68e967c63bd2237c;p=modules%2Fkernel.git PR: oublis portage CCRT : deplacement using namspace std --- diff --git a/src/Batch/Batch_APIInternalFailureException.hxx b/src/Batch/Batch_APIInternalFailureException.hxx index 14bf01f4f..946851c59 100644 --- 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 e60b75b4b..cd310b4c6 100644 --- 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 62a972bd4..9f83ba9d7 100644 --- 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 9010e2356..4ae535c96 100644 --- 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 2bd92c6c0..6a7c10038 100644 --- a/src/Batch/Batch_LongType.cxx +++ b/src/Batch/Batch_LongType.cxx @@ -11,6 +11,7 @@ #include //#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 fb8605c1b..47547061f 100644 --- 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 98d45c14a..d1a397ef7 100644 --- 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: