X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=src%2FgdcmDict.cxx;h=3acd3fc310fe3db56d154c6508c14b96024ade12;hb=4b22e3b8d982d7d46d64aea9f71b2fd04b1a394d;hp=6808a8d0b27778cf83e319aefdab33fc3c875b85;hpb=eb941e8785d3742b8a6a1aac964d43dcb4cf49f0;p=gdcm.git

diff --git a/src/gdcmDict.cxx b/src/gdcmDict.cxx
index 6808a8d0..3acd3fc3 100644
--- a/src/gdcmDict.cxx
+++ b/src/gdcmDict.cxx
@@ -1,19 +1,8 @@
 // gdcmDict.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 <fstream>
 #include "gdcmDict.h"
 #include "gdcmUtil.h"
-using namespace std;
+#include <fstream>
 
 /**
  * \ingroup gdcmDict
@@ -42,7 +31,7 @@ gdcmDict::gdcmDict(std::string & FileName) {
       from.getline(buff, 256, '\n');
       name = buff;
       gdcmDictEntry * newEntry = new gdcmDictEntry(group, element,
-		                                         vr, fourth, name);
+		                                   vr, fourth, name);
       // FIXME: use AddNewEntry
       NameHt[name] = newEntry;
       KeyHt[gdcmDictEntry::TranslateToKey(group, element)] = newEntry;
@@ -85,11 +74,11 @@ void gdcmDict::Print(std::ostream& os) {
 void gdcmDict::PrintByKey(std::ostream& os) {
    for (TagKeyHT::iterator tag = KeyHt.begin(); tag != KeyHt.end(); ++tag){
       os << "Tag : ";
-      os << "(" << hex << tag->second->GetGroup() << ',';
-      os << hex << tag->second->GetElement() << ") = " << dec;
+      os << "(" << std::hex << tag->second->GetGroup() << ',';
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec;
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
-      os << tag->second->GetName() << "."  << endl;
+      os << tag->second->GetName() << "."  << std::endl;
    }
 }
 
@@ -106,7 +95,7 @@ void gdcmDict::PrintByName(std::ostream& os) {
       os << tag->second->GetVR() << ", ";
       os << tag->second->GetFourth() << ", ";
       os << "(" << std::hex << tag->second->GetGroup() << ',';
-      os << std::hex << tag->second->GetElement() << ") = " << dec << std::endl;
+      os << std::hex << tag->second->GetElement() << ") = " << std::dec << std::endl;
    }
 }