remove the ABI compatible stub for GetListOfFilesInDir

diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index da32983f11ab13dc2c7a7ff448cbec122a677ae5..75adce305818fefd90de8daa75e430ee53063dc6 100644 (file)
--- a/apt-pkg/contrib/fileutl.cc
+++ b/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. */
 // ---------------------------------------------------------------------
 /* 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)
 {
 std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
                                        bool const &SortList, bool const &AllowNoExt)
 {

diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index 85a94898c4123767492c0d013dfcfc1795c83c68..351d53c5e089abeb197357ee6454b593ffc3d59d 100644 (file)
--- a/apt-pkg/contrib/fileutl.h
+++ b/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);
 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,
 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();
 std::vector<string> GetListOfFilesInDir(string const &Dir, std::vector<string> const &Ext,
                                        bool const &SortList);
 string SafeGetCWD();