From: jpr <jpr>
Date: Thu, 13 Mar 2003 15:56:26 +0000 (+0000)
Subject: fin sac de noeuds avec #include <string>
X-Git-Tag: April2003~17
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=85916ae574066cf03c252dcc912f1abf605f461a;p=gdcm.git

fin sac de noeuds avec #include <string>
---

diff --git a/src/gdcm.h b/src/gdcm.h
index c9d6105b..03fde1e8 100644
--- 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 b71d2784..5d7a6617 100644
--- 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;
 }