From e8016805b87bead8eb3dff0d0559c5d9590b721b Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 18 Feb 2020 12:48:38 +0100 Subject: Remove code tagged APT_PKG_590, add some missing includes Remove all code scheduled to be removed after 5.90, and fix files to include files they previously got from hashes.h including more headers. --- apt-pkg/contrib/hashes.h | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'apt-pkg/contrib/hashes.h') diff --git a/apt-pkg/contrib/hashes.h b/apt-pkg/contrib/hashes.h index dad50c564..e2a9927ef 100644 --- a/apt-pkg/contrib/hashes.h +++ b/apt-pkg/contrib/hashes.h @@ -13,12 +13,10 @@ #define APTPKG_HASHES_H #include -#include -#include -#include #include #include +#include @@ -171,15 +169,6 @@ class PrivateHashes; class Hashes { PrivateHashes * const d; -APT_IGNORE_DEPRECATED_PUSH - /* TODO: those will disappear in the future as it is hard to add new ones this way. - * Use Add* to build the results and get them via GetHashStringList() instead */ - MD5Summation MD5 APT_PKG_590("Remove"); - SHA1Summation SHA1 APT_PKG_590("Remove"); - SHA256Summation SHA256 APT_PKG_590("Remove"); - SHA512Summation SHA512 APT_PKG_590("Remove"); -APT_IGNORE_DEPRECATED_POP - public: static const int UntilEOF = 0; -- cgit v1.2.3-70-g09d2