Header mismatch with cpp file: corrected

[gdcm.git] / src / gdcmUtil.h

diff --git a/src/gdcmUtil.h b/src/gdcmUtil.h
index 325bde910b5bdf53f33cb03e3b8ce960b633d05c..08e26fb39feb817fa827201200f6a8972fecc073 100644 (file)
--- a/src/gdcmUtil.h
+++ b/src/gdcmUtil.h
@@ -1,4 +1,4 @@
-// gdcmUtil.h
+// $Header: /cvs/public/gdcm/src/gdcmUtil.h,v 1.10 2003/05/21 16:26:28 regrain Exp $
 
 #ifndef GDCMUTIL_H
 #define GDCMUTIL_H
@@ -7,7 +7,7 @@
 #include <vector>
 #include <string>
 #include "gdcmVR.h"
-using namespace std;
+#include "gdcmDictSet.h"
 
 class gdcmDebug {
 private:
@@ -24,17 +24,19 @@ public:
 class gdcmGlobal {
 private:
    static gdcmVR *VR; 
+   static gdcmDictSet *Dicts; 
 public:
    gdcmGlobal(void);
-   ~gdcmGlobal(void);
+   ~gdcmGlobal();
    static gdcmVR * GetVR(void);
+   static gdcmDictSet * GetDicts(void);
 };
 
-istream & eatwhite(istream & is);
+std::istream & eatwhite(std::istream & is);
 
-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 = " ");
 
 extern gdcmDebug dbg;