diff options
| author | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 12:51:26 +0100 |
|---|---|---|
| committer | David Kalnischkies <david@kalnischkies.de> | 2017-12-13 23:53:26 +0100 |
| commit | 5d5ca1aac76448cdfd16972090d246c44671dce6 (patch) | |
| tree | a88f573d8e507ee67af34041e3cd6b3753e4a48a /apt-pkg/deb | |
| parent | 17cc2fda76ed80b7d56a967d92c4204ef0f4dd10 (diff) | |
deprecate the single-line deprecation ignoring macro
gcc has problems understanding this construct and additionally thinks it
would produce multiple lines and stuff, so to keep using it isn't really
worth it for the few instances we have: We can just write the long form
there which works better.
Reported-By: gcc
Gbp-Dch: Ignore
Diffstat (limited to 'apt-pkg/deb')
| -rw-r--r-- | apt-pkg/deb/debmetaindex.cc | 6 | ||||
| -rw-r--r-- | apt-pkg/deb/debsrcrecords.cc | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/apt-pkg/deb/debmetaindex.cc b/apt-pkg/deb/debmetaindex.cc index c2579e12d..ad27e2dcd 100644 --- a/apt-pkg/deb/debmetaindex.cc +++ b/apt-pkg/deb/debmetaindex.cc @@ -459,8 +459,10 @@ bool debReleaseIndex::Load(std::string const &Filename, std::string * const Erro Sum->MetaKeyFilename = Name; Sum->Size = Size; Sum->Hashes.FileSize(Size); - APT_IGNORE_DEPRECATED(Sum->Hash = hs;) - Entries[Name] = Sum; + APT_IGNORE_DEPRECATED_PUSH + Sum->Hash = hs; + APT_IGNORE_DEPRECATED_POP + Entries[Name] = Sum; } Entries[Name]->Hashes.push_back(hs); FoundHashSum = true; diff --git a/apt-pkg/deb/debsrcrecords.cc b/apt-pkg/deb/debsrcrecords.cc index 1cabfe281..7fd206ed6 100644 --- a/apt-pkg/deb/debsrcrecords.cc +++ b/apt-pkg/deb/debsrcrecords.cc @@ -241,7 +241,11 @@ bool debSrcRecordParser::Files2(std::vector<pkgSrcRecords::File2> &List) if (file != List.end()) { if (checksumField == "Files") - APT_IGNORE_DEPRECATED(file->MD5Hash = hash;) + { + APT_IGNORE_DEPRECATED_PUSH + file->MD5Hash = hash; + APT_IGNORE_DEPRECATED_POP + } // an error here indicates that we have two different hashes for the same file if (file->Hashes.push_back(hashString) == false) return _error->Error("Error parsing checksum in %s of source package %s", checksumField.c_str(), Package().c_str()); |