BUG: Remove demangle code this was seg faulting on some linux gcc 3.3.2 machine

[gdcm.git] / src / gdcmDirList.h

diff --git a/src/gdcmDirList.h b/src/gdcmDirList.h
index 0ffb6c1ebcc63c88abcdf696b9eab5821870cffc..47a55050fc199aed111fc58e515745fccc7d1b85 100644 (file)
--- a/src/gdcmDirList.h
+++ b/src/gdcmDirList.h
@@ -1,5 +1,21 @@
-// gdcmDirList.h
-//-----------------------------------------------------------------------------
+/*=========================================================================
+                                                                                
+  Program:   gdcm
+  Module:    $RCSfile: gdcmDirList.h,v $
+  Language:  C++
+  Date:      $Date: 2004/10/27 22:58:06 $
+  Version:   $Revision: 1.13 $
+                                                                                
+  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.html for details.
+                                                                                
+     This software is distributed WITHOUT ANY WARRANTY; without even
+     the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+     PURPOSE.  See the above copyright notices for more information.
+                                                                                
+=========================================================================*/
+
 #ifndef GDCMDIRLIST_H
 #define GDCMDIRLIST_H
 
@@ -8,18 +24,24 @@
 #include <string>
 #include <list>
 
+namespace gdcm 
+{
+
 //-----------------------------------------------------------------------------
 /**
- * \ingroup gdcmDirList
+ * \ingroup DirList
  * \brief   List containing the file headers from root directory. 
  */
-class GDCM_EXPORT gdcmDirList: public std::list<std::string>
+// NOTE: Due to a VC6 'feature' we can not export a std::list in a dll, 
+// so GDCM_EXPORT keyword was removed for this class only
+
+class DirList: public std::list<std::string>
 {
 public :
-   gdcmDirList(std::string dirName,bool recursive=false);
-   virtual ~gdcmDirList(void);
+   DirList(std::string const & dirName, bool recursive=false);
+   virtual ~DirList();
 
-   std::string GetDirName(void);
+   std::string const & GetDirName() const;
 
    /// Character '\' 
    static const char SEPARATOR_X;
@@ -29,10 +51,11 @@ public :
    static const std::string SEPARATOR;
 
 private :
-   void Explore(std::string dirName,bool recursive=false);
+   int Explore(std::string const & dirName, bool recursive=false);
+
    /// name of the root directory to explore
    std::string name;
 };
-
+} // end namespace gdcm
 //-----------------------------------------------------------------------------
 #endif