diff options
author | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-18 12:48:38 +0100 |
---|---|---|
committer | Julian Andres Klode <julian.klode@canonical.com> | 2020-02-18 12:48:38 +0100 |
commit | e8016805b87bead8eb3dff0d0559c5d9590b721b (patch) | |
tree | 2b56db6a3e0bcad1389f2ab8663a09d1dc2c0b94 /apt-pkg/contrib/hashes.h | |
parent | 4cf64a718f5630f8fcee8989f5ab1b88bb1932a7 (diff) |
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.
Diffstat (limited to 'apt-pkg/contrib/hashes.h')
-rw-r--r-- | apt-pkg/contrib/hashes.h | 13 |
1 files changed, 1 insertions, 12 deletions
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 <apt-pkg/macros.h> -#include <apt-pkg/md5.h> -#include <apt-pkg/sha1.h> -#include <apt-pkg/sha2.h> #include <cstring> #include <string> +#include <vector> @@ -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; |