diff options
| author | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 12:53:04 +0100 |
|---|---|---|
| committer | Julian Andres Klode <julian.klode@canonical.com> | 2019-02-26 16:31:20 +0100 |
| commit | 97bd7e492bad1ef50f2659faef61b409ffe67311 (patch) | |
| tree | c8d8c259e26777d0235ab73ae1e0f573d04874c0 /apt-pkg | |
| parent | 4514f29a3ce0ef8cfdc9665c99ec64da762f6478 (diff) | |
metaindex: Remove deprecated checkSum::Hash (replaced by Hashes)
Diffstat (limited to 'apt-pkg')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 3 | ||||
| -rw-r--r-- | apt-pkg/metaindex.h | 4 |
2 files changed, 0 insertions, 7 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index f88076abf..f2a6b97ad 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -510,9 +510,6 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro Sum->MetaKeyFilename = Name; Sum->Size = Size; Sum->Hashes.FileSize(Size); - APT_IGNORE_DEPRECATED_PUSH - Sum->Hash = hs; - APT_IGNORE_DEPRECATED_POP Entries[Name] = Sum; } Entries[Name]->Hashes.push_back(hs); diff --git a/apt-pkg/metaindex.h b/apt-pkg/metaindex.h index 08664305e..08affe888 100644 --- a/apt-pkg/metaindex.h +++ b/apt-pkg/metaindex.h @@ -30,16 +30,12 @@ class metaIndexPrivate; class metaIndex { public: - APT_IGNORE_DEPRECATED_PUSH struct checkSum { std::string MetaKeyFilename; HashStringList Hashes; unsigned long long Size; - - APT_DEPRECATED_MSG("Use the HashStringList member Hashes instead of a hardcoded HashString") HashString Hash; }; - APT_IGNORE_DEPRECATED_POP enum APT_HIDDEN TriState { TRI_YES, TRI_DONTCARE, TRI_NO, TRI_UNSET |