summaryrefslogtreecommitdiff
path: root/apt-pkg/indexrecords.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <david@kalnischkies.de>2014-10-26 23:17:03 +0100
committerDavid Kalnischkies <david@kalnischkies.de>2014-11-08 14:26:00 +0100
commit586d8704716a10e0f8b9c400cab500f5353eebe6 (patch)
tree9318582dc8c53a88084ad00c4dfa6d02c83b3ca6 /apt-pkg/indexrecords.h
parent23fb7b2cbbda62c99a199d29ad62205b23d35af4 (diff)
replace ignore-deprecated #pragma dance with _Pragma
For compatibility we use/provide and fill quiet some deprecated methods and fields, which subsequently earns us a warning for using them. These warnings therefore have to be disabled for these codeparts and that is what this change does now in a slightly more elegant way. Git-Dch: Ignore
Diffstat (limited to 'apt-pkg/indexrecords.h')
-rw-r--r--apt-pkg/indexrecords.h10
1 files changed, 2 insertions, 8 deletions
diff --git a/apt-pkg/indexrecords.h b/apt-pkg/indexrecords.h
index 88a06779c..06b9dafa6 100644
--- a/apt-pkg/indexrecords.h
+++ b/apt-pkg/indexrecords.h
@@ -76,11 +76,7 @@ class indexRecords
virtual ~indexRecords();
};
-#if __GNUC__ >= 4
- // ensure that con- & de-structor don't trigger this warning
- #pragma GCC diagnostic push
- #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#endif
+APT_IGNORE_DEPRECATED_PUSH
struct indexRecords::checkSum
{
std::string MetaKeyFilename;
@@ -89,8 +85,6 @@ struct indexRecords::checkSum
APT_DEPRECATED HashString Hash;
};
-#if __GNUC__ >= 4
- #pragma GCC diagnostic pop
-#endif
+APT_IGNORE_DEPRECATED_POP
#endif