X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=1e135cb65dae7045e178320209bfad79d0e3628b;hb=ed56baf15ad8436b6db9c9022a4c0a663248c1ca;hp=c9b1ca0c687943e563402b8ce861d2818e3257f3;hpb=e06d61ba347d7f5f692a682434e089d939f85653;p=gdcm.git

diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx
index c9b1ca0c..1e135cb6 100644
--- a/src/gdcmDictEntry.cxx
+++ b/src/gdcmDictEntry.cxx
@@ -1,17 +1,29 @@
-// gdcmDict.cxx
+// gdcmDictEntry.cxx
 
-#include "gdcm.h"
+//This is needed when compiling in debug mode
+#ifdef _MSC_VER
+// 'identifier' : class 'type' needs to have dll-interface to be used by
+// clients of class 'type2'
+#pragma warning ( disable : 4251 )
+// 'identifier' : identifier was truncated to 'number' characters in the
+// debug information
+#pragma warning ( disable : 4786 )
+#endif //_MSC_VER
+
+#include <stdio.h>    // FIXME For sprintf
+#include "gdcmDictEntry.h"
 #include "gdcmUtil.h"
 
+
 gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement,
-                             string  InVr, string InFourth, string InName) 
-{
-	group = InGroup;
-	element = InElement;
-	vr = InVr;
-	fourth = InFourth;
-	name = InName;
-	key = TranslateToKey(group, element);
+                             std::string  InVr, std::string InFourth,
+                             std::string  InName) {
+	group 		= InGroup;
+	element 	= InElement;
+	vr 		= InVr;
+	fourth 		= InFourth;
+	name 		= InName;
+	key 		= TranslateToKey(group, element);
 }
 
 TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
@@ -30,7 +42,7 @@ TagKey gdcmDictEntry::TranslateToKey(guint16 group, guint16 element) {
  * \brief       If-and only if-the vr is unset then overwrite it.
  * @param NewVr New vr to be set.
  */
-void gdcmDictEntry::SetVR(string NewVr) {
+void gdcmDictEntry::SetVR(std::string NewVr) {
 	if ( IsVrUnknown() )
 		vr = NewVr;
 	else {