X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=src%2FgdcmDirList.cxx;h=ca5c5fa1fc38b1ffae0ff13dfb870f56d4e5e087;hb=7ffa5a65da43145ef4cfe6a1bbd413842f7ee94e;hp=394a0c4ed2e76016d1aed5431df8b0d8b30e0708;hpb=6bcd9b8c2dca341ac79674be22c3d09323ee6e78;p=gdcm.git diff --git a/src/gdcmDirList.cxx b/src/gdcmDirList.cxx index 394a0c4e..ca5c5fa1 100644 --- a/src/gdcmDirList.cxx +++ b/src/gdcmDirList.cxx @@ -3,8 +3,8 @@ Program: gdcm Module: $RCSfile: gdcmDirList.cxx,v $ Language: C++ - Date: $Date: 2004/10/27 22:58:06 $ - Version: $Revision: 1.24 $ + Date: $Date: 2004/12/12 13:32:23 $ + Version: $Revision: 1.29 $ Copyright (c) CREATIS (Centre de Recherche et d'Applications en Traitement de l'Image). All rights reserved. See Doc/License.txt or @@ -22,7 +22,7 @@ #include #include -#if defined(_MSC_VER) || defined (__CYGWIN__) +#if defined(_MSC_VER) || defined(__BORLANDC__) #include #ifdef _MSC_VER #include @@ -80,18 +80,17 @@ std::string const & DirList::GetDirName() const // Private /** - * \ingroup DirList * \brief Explore a directory with possibility of recursion * return number of files read - * @param dirName directory to explore + * @param dirpath directory to explore * @param recursive whether we want recursion or not */ -int DirList::Explore(std::string const & dirName, bool recursive) +int DirList::Explore(std::string const & dirpath, bool recursive) { int numberOfFiles = 0; std::string fileName; - Util::NormalizePath(dirName); -#if defined(_MSC_VER) || defined(__CYGWIN__) + std::string dirName = Util::NormalizePath(dirpath); +#if defined(_MSC_VER) || defined(__BORLANDC__) WIN32_FIND_DATA fileData; HANDLE hFile=FindFirstFile((dirName+"*").c_str(),&fileData); int found = true;