Sub-minor std-related fixes... Jpr+Frog

diff --git a/src/gdcmBinEntry.cxx b/src/gdcmBinEntry.cxx
index 63260fd4c4438e1d9a4f119abc2e74eff79588da..376e86f928c5cba60255be08ab9377e5aeb308ce 100644 (file)
--- a/src/gdcmBinEntry.cxx
+++ b/src/gdcmBinEntry.cxx
@@ -29,7 +29,7 @@ gdcmBinEntry::~gdcmBinEntry(){
  * \brief   canonical Printer
  */
  
-void gdcmBinEntry::Print(std::ostream &os = std::cout) {
+void gdcmBinEntry::Print(std::ostream &os) {
    PrintCommonPart(os);
    std::cout << " gdcmBinEntry : Print, so WHAT ?" <<std::endl;
 }

diff --git a/src/gdcmDocument.cxx b/src/gdcmDocument.cxx
index d5852766f98d7a059408fbb6c6f10fcb5023e140..7a987771e99c1aa8d9424f5c86e322bad6e752af 100644 (file)
--- a/src/gdcmDocument.cxx
+++ b/src/gdcmDocument.cxx
@@ -1096,7 +1096,7 @@ long gdcmDocument::ParseDES(gdcmDocEntrySet *set, long offset, long l_max, bool
    gdcmValEntry *vl;
    gdcmBinEntry *bn;   
    gdcmSeqEntry *sq;
-   string vr;
+   std::string vr;
    long l;
    int depth; 
    

diff --git a/src/gdcmElementSet.cxx b/src/gdcmElementSet.cxx
index d357da30055e3b69dfafb6d79522b14c7b0a1069..36ebbd2b32ef09b888e0bad868309ba3740710d7 100644 (file)
--- a/src/gdcmElementSet.cxx
+++ b/src/gdcmElementSet.cxx
@@ -43,7 +43,6 @@ gdcmElementSet::~gdcmElementSet()
   * @return
   */ 
 void gdcmElementSet::Print(std::ostream & os) {
-   cout << "entree ds gdcmElementSet::Print" << endl;
    for (TagDocEntryHT::iterator i = tagHT.begin(); i != tagHT.end(); ++i)  
    {
       //(*i)->second->SetPrintLevel(printLevel);

diff --git a/src/gdcmSeqEntry.cxx b/src/gdcmSeqEntry.cxx
index 70e96f2bde4fd17cdda35a6cd013a811eb7beedf..39f4c98a7451474d47d7e480a718847882a4bc95 100644 (file)
--- a/src/gdcmSeqEntry.cxx
+++ b/src/gdcmSeqEntry.cxx
@@ -45,7 +45,7 @@ gdcmSeqEntry::~gdcmSeqEntry() {
 void gdcmSeqEntry::Print(std::ostream &os){
 
    std::ostringstream s,s2;
-   string vr;
+   std::string vr;
    unsigned short int g, e;
    long lgth;
    size_t o;