Просмотр исходного кода

remove the ABI compatible stub for GetListOfFilesInDir

David Kalnischkies лет назад: 16
Родитель
Сommit
b3793d41d4
2 измененных файлов с 1 добавлено и 9 удалено
  1. 0 5
      apt-pkg/contrib/fileutl.cc
  2. 1 4
      apt-pkg/contrib/fileutl.h

+ 0 - 5
apt-pkg/contrib/fileutl.cc

@@ -201,11 +201,6 @@ bool FileExists(string File)
 // ---------------------------------------------------------------------
 /* If an extension is given only files with this extension are included
    in the returned vector, otherwise every "normal" file is included. */
-std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
-					bool const &SortList)
-{
-   return GetListOfFilesInDir(Dir, Ext, SortList, false);
-}
 std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
 					bool const &SortList, bool const &AllowNoExt)
 {

+ 1 - 4
apt-pkg/contrib/fileutl.h

@@ -82,11 +82,8 @@ bool RunScripts(const char *Cnf);
 bool CopyFile(FileFd &From,FileFd &To);
 int GetLock(string File,bool Errors = true);
 bool FileExists(string File);
-// FIXME: next ABI-Break: merge the two method-headers
 std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
-					bool const &SortList);
-std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
-					bool const &SortList, bool const &AllowNoExt);
+					bool const &SortList, bool const &AllowNoExt=false);
 std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
 					bool const &SortList);
 string SafeGetCWD();