fin sac de noeuds avec #include <string>

diff --git a/src/gdcm.h b/src/gdcm.h
index c9d6105b4adc326a2bd2dcd708604a659fc7754c..03fde1e83be0eefdedc2b543e273f6ade21ff6d9 100644 (file)
--- a/src/gdcm.h
+++ b/src/gdcm.h
@@ -3,7 +3,7 @@
 #ifndef GDCM_H
 #define GDCM_H
 
-using namespace std;
+//using namespace std;
 
 // JPR CLEAN
 // En fait, je disais que dans LE Directory Dicom (dans son etat 2001)

diff --git a/src/gdcmElValSet.cxx b/src/gdcmElValSet.cxx
index b71d2784ac265a6f705ec62101f07d7b2ea5dd77..5d7a66173d455928fd4f83399be296d83af91989 100644 (file)
--- a/src/gdcmElValSet.cxx
+++ b/src/gdcmElValSet.cxx
@@ -1,8 +1,15 @@
-// $Id: gdcmElValSet.cxx,v 1.18 2003/03/12 23:38:58 frog Exp $
+// $Id: gdcmElValSet.cxx,v 1.19 2003/03/13 15:56:26 jpr Exp $
 
 #include "gdcmUtil.h"
 #include "gdcmElValSet.h"
 
+<<<<<<< gdcmElValSet.cxx
+
+#include <vector>
+static void Tokenize (const string& str, vector<string>& tokens, const string& delimiters);
+
+
+
 TagElValueHT & gdcmElValSet::GetTagHt(void) {
        return tagHt;
 }