merge with current debian apt/sid

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

diff --git a/apt-pkg/policy.h b/apt-pkg/policy.h
index 28cb3ccbb1dee3624d3bab801c1086a070b578bf..a5e6c6048020ba2c4c89d6c24832a726a68179fa 100644 (file)
--- a/apt-pkg/policy.h
+++ b/apt-pkg/policy.h
@@ -55,6 +55,7 @@ class pkgPolicy : public pkgDepCache::Policy
    struct PkgPin : Pin
    {
       string Pkg;
    struct PkgPin : Pin
    {
       string Pkg;

+      PkgPin(string const &Pkg) : Pin(), Pkg(Pkg) {};

    };
    
    Pin *Pins;
    };
    
    Pin *Pins;


@@ -76,7 +77,7 @@ class pkgPolicy : public pkgDepCache::Policy
 
    // Things for the cache interface.
    virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg);
 
    // Things for the cache interface.
    virtual pkgCache::VerIterator GetCandidateVer(pkgCache::PkgIterator const &Pkg);

-   virtual bool IsImportantDep(pkgCache::DepIterator Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};
+   virtual bool IsImportantDep(pkgCache::DepIterator const &Dep) {return pkgDepCache::Policy::IsImportantDep(Dep);};

    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);
    bool InitDefaults();
    
    pkgPolicy(pkgCache *Owner);