allow all dpkg selections to be set via apt-mark and libapt

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

diff --git a/apt-pkg/pkgrecords.h b/apt-pkg/pkgrecords.h
index 766e845aa5923b85786c98ea633740a6a241be3e..0ed731f1f96e0493cb71b8b6986977d999622392 100644 (file)
--- a/apt-pkg/pkgrecords.h
+++ b/apt-pkg/pkgrecords.h
@@ -31,7 +31,7 @@ class pkgRecords                                                      /*{{{*/
    
    private:
    /** \brief dpointer placeholder (for later in case we need it) */
    
    private:
    /** \brief dpointer placeholder (for later in case we need it) */

-   void *d;
+   void * const d;

    
    pkgCache &Cache;
    std::vector<Parser *>Files;
    
    pkgCache &Cache;
    std::vector<Parser *>Files;


@@ -68,17 +68,10 @@ class pkgRecords::Parser                                            /*{{{*/
     * choose the hash to be used.
     */
    virtual HashStringList Hashes() const { return HashStringList(); };
     * choose the hash to be used.
     */
    virtual HashStringList Hashes() const { return HashStringList(); };

-#if APT_PKG_ABI >= 413

    APT_DEPRECATED std::string MD5Hash() const { return GetHashFromHashes("MD5Sum"); };
    APT_DEPRECATED std::string SHA1Hash() const { return GetHashFromHashes("SHA1"); };
    APT_DEPRECATED std::string SHA256Hash() const { return GetHashFromHashes("SHA256"); };
    APT_DEPRECATED std::string SHA512Hash() const { return GetHashFromHashes("SHA512"); };
    APT_DEPRECATED std::string MD5Hash() const { return GetHashFromHashes("MD5Sum"); };
    APT_DEPRECATED std::string SHA1Hash() const { return GetHashFromHashes("SHA1"); };
    APT_DEPRECATED std::string SHA256Hash() const { return GetHashFromHashes("SHA256"); };
    APT_DEPRECATED std::string SHA512Hash() const { return GetHashFromHashes("SHA512"); };

-#else
-   APT_DEPRECATED std::string MD5Hash() { return GetHashFromHashes("MD5Sum"); };
-   APT_DEPRECATED std::string SHA1Hash() { return GetHashFromHashes("SHA1"); };
-   APT_DEPRECATED std::string SHA256Hash() { return GetHashFromHashes("SHA256"); };
-   APT_DEPRECATED std::string SHA512Hash() { return GetHashFromHashes("SHA512"); };
-#endif

 
    // These are some general stats about the package
    virtual std::string Maintainer() {return std::string();};
 
    // These are some general stats about the package
    virtual std::string Maintainer() {return std::string();};


@@ -111,7 +104,7 @@ class pkgRecords::Parser                                            /*{{{*/
    virtual ~Parser();
 
    private:
    virtual ~Parser();
 
    private:

-   void *d;
+   void * const d;

    APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
    {
       HashStringList const hashes = Hashes();
    APT_HIDDEN std::string GetHashFromHashes(char const * const type) const
    {
       HashStringList const hashes = Hashes();