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

5 files changed, 16 insertions, 5 deletions

diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc
index b13bd203b..b3eb75d16 100644
--- a/apt-pkg/acquire-item.cc
+++ b/apt-pkg/acquire-item.cc
@@ -971,7 +971,9 @@ bool pkgAcquire::Item::RenameOnError(pkgAcquire::Item::RenameOnErrorState const
 void pkgAcquire::Item::SetActiveSubprocess(const std::string &subprocess)/*{{{*/
 {
       ActiveSubprocess = subprocess;
-      APT_IGNORE_DEPRECATED(Mode = ActiveSubprocess.c_str();)
+      APT_IGNORE_DEPRECATED_PUSH
+      Mode = ActiveSubprocess.c_str();
+      APT_IGNORE_DEPRECATED_POP
 }
 									/*}}}*/
 // Acquire::Item::ReportMirrorFailure					/*{{{*/
diff --git a/apt-pkg/contrib/macros.h b/apt-pkg/contrib/macros.h
index abf99f7a2..57d3f6c22 100644
--- a/apt-pkg/contrib/macros.h
+++ b/apt-pkg/contrib/macros.h
@@ -143,6 +143,7 @@
 		_Pragma("GCC diagnostic ignored \"-Wdeprecated-declarations\"")
 	#define APT_IGNORE_DEPRECATED_POP \
 		_Pragma("GCC diagnostic pop")
+	/* gcc has various problems with this shortcut, so prefer the long form */
 	#define APT_IGNORE_DEPRECATED(XXX) \
 		APT_IGNORE_DEPRECATED_PUSH \
 		XXX \
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());
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);