restore ABI of pkgTagSection

[apt.git] / apt-pkg / contrib / hashes.h

diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h
index caeba006d04d6a8b465ae613233ee0a607995e54..1548624575cc9c0d8f67f13cd48cc59f24eba22c 100644 (file)
--- a/apt-pkg/contrib/hashes.h
+++ b/apt-pkg/contrib/hashes.h
@@ -55,6 +55,8 @@ class HashString
    // get hash type used
    std::string HashType() const { return Type; };
    std::string HashValue() const { return Hash; };
    // get hash type used
    std::string HashType() const { return Type; };
    std::string HashValue() const { return Hash; };

+   APT_DEPRECATED std::string HashType() { return Type; };
+   APT_DEPRECATED std::string HashValue() { return Hash; };

 
    // verify the given filename against the currently loaded hash
    bool VerifyFile(std::string filename) const;
 
    // verify the given filename against the currently loaded hash
    bool VerifyFile(std::string filename) const;


@@ -161,10 +163,10 @@ class HashStringList
    std::vector<HashString> list;
 };
 
    std::vector<HashString> list;
 };
 

+class PrivateHashes;

 class Hashes
 {
 class Hashes
 {

-   /** \brief dpointer placeholder */
-   void *d;
+   PrivateHashes *d;

 
    public:
    /* those will disappear in the future as it is hard to add new ones this way.
 
    public:
    /* those will disappear in the future as it is hard to add new ones this way.


@@ -189,15 +191,10 @@ class Hashes
 
    HashStringList GetHashStringList();
 
 
    HashStringList GetHashStringList();
 

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic push
-       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH

    Hashes();
    virtual ~Hashes();
    Hashes();
    virtual ~Hashes();

-#if __GNUC__ >= 4
-       #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP

 
    private:
    APT_HIDDEN APT_CONST inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512)
 
    private:
    APT_HIDDEN APT_CONST inline unsigned int boolsToFlag(bool const addMD5, bool const addSHA1, bool const addSHA256, bool const addSHA512)