ENH: If possible move the stl include after the gdcm ones, to avoid vc warnings

[gdcm.git] / src / gdcmDicomDirElement.cxx

diff --git a/src/gdcmDicomDirElement.cxx b/src/gdcmDicomDirElement.cxx
index b7517e8d577762114bfd6c9a9b7ca62bc73d1ded..88df039aa62ba30bd3e78863d11b9bfb1b89d48c 100644 (file)
--- a/src/gdcmDicomDirElement.cxx
+++ b/src/gdcmDicomDirElement.cxx
@@ -3,12 +3,12 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmDicomDirElement.cxx,v $
   Language:  C++
-  Date:      $Date: 2004/08/27 15:48:44 $
-  Version:   $Revision: 1.15 $
+  Date:      $Date: 2004/10/08 04:43:37 $
+  Version:   $Revision: 1.17 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
-  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.htm for details.
+  http://www.creatis.insa-lyon.fr/Public/Gdcm/License.html for details.
                                                                                 
      This software is distributed WITHOUT ANY WARRANTY; without even
      the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
@@ -16,15 +16,14 @@
                                                                                 
 =========================================================================*/
 
-#include <fstream>
-#include <stdio.h>    // For sprintf
-#include <iostream>
-
 #include "gdcmDicomDirElement.h"
 #include "gdcmUtil.h"
 #include "gdcmDebug.h"
 #include "gdcmDictSet.h"
 
+#include <fstream>
+#include <stdio.h>    // For sprintf
+#include <iostream>
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -46,7 +45,7 @@ gdcmDicomDirElement::gdcmDicomDirElement()
 
    while (!from.eof())
    {
-      eatwhite(from);
+      from >> std::ws;  // used to be eatwhite(from);
       from.getline(buff, 1024, ' ');
       type = buff;
 
@@ -56,9 +55,9 @@ gdcmDicomDirElement::gdcmDicomDirElement()
       {
          from >> std::hex >> elem.group >> elem.elem;
 
-         eatwhite(from);
+         from >> std::ws; // used to be eatwhite(from);
          from.getline(buff, 1024, '"');
-         eatwhite(from);
+         from >> std::ws; // Used to be eatwhite(from);
          from.getline(buff, 1024, '"');
          elem.value = buff;