fileutl: empty file support: Avoid fstat() on -1 fd and check result

[apt.git] / apt-pkg / policy.h

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 5be6657e9a3d3c5ef0ff331aecedfc9935668052..04747c5a1d4dfe61d611d5d9e42ec0423309423c 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -80,7 +80,7 @@ class pkgPolicy : public pkgDepCache::Policy
    // Things for the cache interface.
    virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
    virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
    // Things for the cache interface.
    virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;
    virtual signed short GetPriority(pkgCache::PkgIterator const &Pkg) APT_OVERRIDE;

-   virtual signed short GetPriority(pkgCache::VerIterator const &Pkg, bool ConsiderFiles = true);
+   virtual signed short GetPriority(pkgCache::VerIterator const &Ver, bool ConsiderFiles = true) APT_OVERRIDE;

    virtual signed short GetPriority(pkgCache::PkgFileIterator const &File) APT_OVERRIDE;
 
    bool InitDefaults();
    virtual signed short GetPriority(pkgCache::PkgFileIterator const &File) APT_OVERRIDE;
 
    bool InitDefaults();


@@ -88,7 +88,6 @@ class pkgPolicy : public pkgDepCache::Policy
    explicit pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy();
    private:
    explicit pkgPolicy(pkgCache *Owner);
    virtual ~pkgPolicy();
    private:

-   APT_HIDDEN pkgCache::VerIterator GetCandidateVerNew(pkgCache::PkgIterator const &Pkg);

    void * const d;
 };
 
    void * const d;
 };