X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=inline;f=src%2FgdcmElValSet.cxx;h=5d7a66173d455928fd4f83399be296d83af91989;hb=85916ae574066cf03c252dcc912f1abf605f461a;hp=b71d2784ac265a6f705ec62101f07d7b2ea5dd77;hpb=c912efe3318a297cfa8ce267ab57cfee973c8125;p=gdcm.git

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;
 }