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/pkgcachegen.cc | |
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/pkgcachegen.cc')
-rw-r--r-- | apt-pkg/pkgcachegen.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index bde0ea122..50c7961e7 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -599,7 +599,9 @@ bool pkgCacheGenerator::NewPackage(pkgCache::PkgIterator &Pkg, StringView Name, Pkg = pkgCache::PkgIterator(Cache,Cache.PkgP + Package); // Set the name, arch and the ID - APT_IGNORE_DEPRECATED(Pkg->Name = Grp->Name;) + APT_IGNORE_DEPRECATED_PUSH + Pkg->Name = Grp->Name; + APT_IGNORE_DEPRECATED_POP Pkg->Group = Grp.Index(); // all is mapped to the native architecture map_stringitem_t const idxArch = (Arch == "all") ? Cache.HeaderP->Architecture : StoreString(MIXED, Arch); |