BUG: Fix problem with typedef. When you use a typedef within a namespace + class...

diff --git a/src/gdcmSerieHelper.cxx b/src/gdcmSerieHelper.cxx
index 77849c9fe1ae1c605713f8a6d7f7a894f060606a..dba1e90c55b09365afc50ea0656872aa16c6411e 100644 (file)
--- a/src/gdcmSerieHelper.cxx
+++ b/src/gdcmSerieHelper.cxx
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.cxx,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 15:12:09 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/02/02 16:16:07 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -27,8 +27,6 @@
 
 namespace gdcm 
 {
-typedef std::list<File* > GdcmFileList;
-typedef std::vector<File* > GdcmFileVector;
 
 //-----------------------------------------------------------------------------
 // Constructor / Destructor
@@ -155,9 +153,7 @@ void SerieHelper::OrderGdcmFileList(GdcmFileList *CoherentGdcmFileList)
  * \brief   Get the first List while visiting the CoherentFileListHT
  * @return  The first GdcmFileList if found, otherwhise NULL
  */
- std::list<File* > *SerieHelper::GetFirstCoherentFileList()
-// Why doesn't it compile ?!?
-//GdcmFileList *SerieHelper::GetFirstCoherentFileList()
+GdcmFileList *SerieHelper::GetFirstCoherentFileList()
 {
    ItListHt = CoherentGdcmFileListHT.begin();
    if( ItListHt != CoherentGdcmFileListHT.end() )
@@ -170,7 +166,7 @@ void SerieHelper::OrderGdcmFileList(GdcmFileList *CoherentGdcmFileList)
  * \note : meaningfull only if GetFirstCoherentFileList already called
  * @return  The next GdcmFileList if found, otherwhise NULL
  */
-std::list<File* > *SerieHelper::GetNextCoherentFileList()
+GdcmFileList *SerieHelper::GetNextCoherentFileList()
 {
    gdcmAssertMacro (ItListHt != CoherentGdcmFileListHT.end());
   

diff --git a/src/gdcmSerieHelper.h b/src/gdcmSerieHelper.h
index 45fcd4f42b2eff14e116ec89a68d639cdab8b046..47e7178dd93d927e2351eda63a7506c635797d5e 100644 (file)
--- a/src/gdcmSerieHelper.h
+++ b/src/gdcmSerieHelper.h
@@ -3,8 +3,8 @@
   Program:   gdcm
   Module:    $RCSfile: gdcmSerieHelper.h,v $
   Language:  C++
-  Date:      $Date: 2005/02/02 15:12:09 $
-  Version:   $Revision: 1.1 $
+  Date:      $Date: 2005/02/02 16:16:07 $
+  Version:   $Revision: 1.2 $
                                                                                 
   Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de
   l'Image). All rights reserved. See Doc/License.txt or
@@ -20,11 +20,14 @@
 #define GDCMSERIEHELPER_H
 
 #include "gdcmCommon.h" 
+
 #include <list>
 #include <map>
+
 namespace gdcm 
 {
 class File;
+typedef std::list<File* > GdcmFileList;
 
 //-----------------------------------------------------------------------------
 /**
@@ -37,12 +40,12 @@ class File;
 class GDCM_EXPORT SerieHelper 
 {
 public:
-   typedef std::list<File* > GdcmFileList;
    typedef std::map<std::string, GdcmFileList *> CoherentFileListmap;
+   typedef std::vector<File* > GdcmFileVector;
 
-    SerieHelper();
-    ~SerieHelper();
- void Print();
+   SerieHelper();
+   ~SerieHelper();
+   void Print();
 
    /// \todo should return bool or throw error ?
    void AddFileName(std::string const &filename);