X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDictEntry.cxx;h=1e135cb65dae7045e178320209bfad79d0e3628b;hb=9d217e6d20ba46665976a7ac3e631ac52b6cb360;hp=8823ac731748069d4a1df6b941f02fefc44f746e;hpb=0457e1e8fc68df6d9e2d1a0fcd0053ecee3c5ad7;p=gdcm.git diff --git a/src/gdcmDictEntry.cxx b/src/gdcmDictEntry.cxx index 8823ac73..1e135cb6 100644 --- a/src/gdcmDictEntry.cxx +++ b/src/gdcmDictEntry.cxx @@ -1,13 +1,23 @@ // gdcmDictEntry.cxx +//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 // FIXME For sprintf #include "gdcmDictEntry.h" #include "gdcmUtil.h" gdcmDictEntry::gdcmDictEntry(guint16 InGroup, guint16 InElement, - string InVr, string InFourth, - string InName) { + std::string InVr, std::string InFourth, + std::string InName) { group = InGroup; element = InElement; vr = InVr; @@ -32,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 {