istream replaced by std::istream

[gdcm.git] / src / gdcmUtil.cxx

diff --git a/src/gdcmUtil.cxx b/src/gdcmUtil.cxx
index d0a980633fe87cfe3186d8f74cfd6b0724af0dc3..035ec409bb3d9f73ad51c15ba261bcd91e8b2401 100644 (file)
--- a/src/gdcmUtil.cxx
+++ b/src/gdcmUtil.cxx
@@ -1,4 +1,4 @@
-// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.19 2003/09/24 11:37:10 jpr Exp $
+// $Header: /cvs/public/gdcm/src/gdcmUtil.cxx,v 1.21 2003/09/24 13:21:46 jpr Exp $
 
 //This is needed when compiling in debug mode
 #ifdef _MSC_VER
@@ -25,7 +25,7 @@ gdcmDebug::gdcmDebug(int level) {
 void gdcmDebug::Verbose(int Level, const char * Msg1, const char * Msg2) {
    if (Level > DebugLevel)
       return ;
-   std::cerr << Msg1 << ' ' << Msg2 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
 void gdcmDebug::Assert(int Level, bool Test,
@@ -33,19 +33,19 @@ void gdcmDebug::Assert(int Level, bool Test,
    if (Level > DebugLevel)
       return ;
    if (!Test)
-      std::cerr << Msg1 << ' ' << Msg2 << '\n';
+      std::cerr << Msg1 << ' ' << Msg2 << std::endl;
 }
 
 void gdcmDebug::Error( bool Test, const char * Msg1, const char * Msg2) {
    if (!Test)
       return;
-   std::cerr << Msg1 << ' ' << Msg2 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << std::endl;
    Exit(1);
 }
 
 void gdcmDebug::Error(const char* Msg1, const char* Msg2,
                       const char* Msg3) {
-   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << '\n';
+   std::cerr << Msg1 << ' ' << Msg2 << ' ' << Msg3 << std::endl;
    Exit(1);
 }
 
@@ -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,9 +105,9 @@ istream& eatwhite(istream& is) {
 ///////////////////////////////////////////////////////////////////////////
 // Because is not  available in C++ (?)
 
-void Tokenize (const string& str,
-               vector<string>& tokens,
-               const string& delimiters) {
+void Tokenize (const std::string& str,
+               std::vector<std::string>& tokens,
+               const std::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) {