ENH: stdify

diff --git a/src/gdcmDicomDir.cxx b/src/gdcmDicomDir.cxx
index eaa705e4aebe1f3040cacf4e19aee2b119afa816..11550d2df0971a255151008a3258d3c7be0507e8 100644 (file)
--- a/src/gdcmDicomDir.cxx
+++ b/src/gdcmDicomDir.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDir.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.49 $
+  Date:      $Date: 2004/06/22 14:03:30 $
+  Version:   $Revision: 1.50 $
   
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -556,7 +556,7 @@ void gdcmDicomDir::SetElement(std::string &path,gdcmDicomDirType type,
    }
 
    for(it=elemList.begin();it!=elemList.end();++it) {
-      cout << "it " << endl;
+      std::cout << "it " << std::endl;
       tmpGr=it->group;
       tmpEl=it->elem;
       dictEntry=GetPubDict()->GetDictEntryByNumber(tmpGr,tmpEl);

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index fbf2d31df599347bb20110f02e05e126298ac689..a31ca8d20cde80603443e5be99c2230010998165 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmElementSet.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.9 $
+  Date:      $Date: 2004/06/22 14:03:30 $
+  Version:   $Revision: 1.10 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -83,7 +83,7 @@ void gdcmElementSet::Write(FILE *fp, FileType filetype) {
    {
       e=i->second;     
           e->WriteCommonPart(fp, filetype);
-               std::cout<<e->GetKey() << " " << hex << e->GetVR() << " " 
+               std::cout<<e->GetKey() << " " << std::hex << e->GetVR() << " " 
                         << e->GetName()
                         << std::endl;
                                        

diff --git a/src/gdcmValEntry.cxx b/src/gdcmValEntry.cxx
index 8f543f34ca57c4e5cbd08851ac8929de64cb4a0c..ee0b42b8ebd44a1182bdfb84244c682e6dbe89c8 100644 (file)
--- a/src/gdcmValEntry.cxx
+++ b/src/gdcmValEntry.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmValEntry.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/06/22 13:47:33 $
-  Version:   $Revision: 1.10 $
+  Date:      $Date: 2004/06/22 14:03:30 $
+  Version:   $Revision: 1.11 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -138,7 +138,7 @@ void gdcmValEntry::Print(std::ostream & os)
  * \brief   canonical Writer
  */
 void gdcmValEntry::Write(FILE *fp, FileType filetype) {
-      string vr=GetVR();
+      std::string vr=GetVR();
       int lgr=GetLength();
       if (vr == "US" || vr == "SS") {
          // some 'Short integer' fields may be mulivaluated