Remaining ...

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index 96958337420eef588c35eb75c23d2030db570e35..90e945b2a1b50c1c88e4ba13c953b130ed83aee7 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.20 2003/09/24 13:00:59 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.24 2003/09/24 13:29:49 jpr Exp $
 
 //This is needed when compiling in debug mode
 #ifdef _MSC_VER
@@ -91,7 +91,7 @@ gdcmDictSet * gdcmGlobal::GetDicts(void) {
 
 ///////////////////////////////////////////////////////////////////////////
 // Because is not yet available in g++2.96
-istream& eatwhite(istream& is) {
+std::istream& eatwhite(std::istream& is) {
    char c;
    while (is.get(c)) {
       if (!isspace(c)) {
@@ -105,12 +105,12 @@ istream& eatwhite(istream& is) {
 ///////////////////////////////////////////////////////////////////////////
 // Because is not  available in C++ (?)
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters) {
-   string::size_type lastPos = str.find_first_not_of(delimiters,0);
-   string::size_type pos     = str.find_first_of    (delimiters,lastPos);
-   while (string::npos != pos || string::npos != lastPos) {
+void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::string& delimiters) {
+   std::string::size_type lastPos = str.find_first_not_of(delimiters,0);
+   std::string::size_type pos     = str.find_first_of    (delimiters,lastPos);
+   while (std::string::npos != pos || std::string::npos != lastPos) {
       tokens.push_back(str.substr(lastPos, pos - lastPos));
       lastPos = str.find_first_not_of(delimiters, pos);
       pos     = str.find_first_of    (delimiters, lastPos);
@@ -151,7 +151,7 @@ std::string _CreateCleanString(std::string s) {
          *di = '.';
       }        
    return d;*/
-  string str=s;
+  std::string str=s;
   for(int i=0;i<str.size();i++)
   {
     if(!isprint(str[i]))
@@ -167,7 +167,7 @@ std::string _CreateCleanString(std::string s) {
 
 std::string TranslateToKey(guint16 group, guint16 element) {
        char trash[10];
-       string key;
+       std::string key;
        // CLEAN ME: better call the iostream<< with the hex manipulator on.
        // This requires some reading of the stdlibC++ sources to make the
        // proper call (or copy).