diff options
| author | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2015-06-23 12:17:35 +0100 |
| commit | 245dde96193702f7f51389d3583dee547f8ba366 (patch) | |
| tree | 6cf8c191641c760bcc6a6c08fb0ff65d27e0cffd /apt-pkg/vendorlist.cc | |
| parent | 5530255b5f3ad7de2e23dfcb39ce325001126501 (diff) | |
| parent | c8a4ce6cbed57ae108dc955d4a850f9b129a0693 (diff) | |
Merge remote-tracking branch 'donkult/debian/experimental' into debian/experimental
Diffstat (limited to 'apt-pkg/vendorlist.cc')
| -rw-r--r-- | apt-pkg/vendorlist.cc | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc index fb33ff17d..db5b87fc0 100644 --- a/apt-pkg/vendorlist.cc +++ b/apt-pkg/vendorlist.cc @@ -11,10 +11,8 @@ #include <apti18n.h> -#if __GNUC__ >= 4 - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif +// The whole vendor system is deprecated +APT_IGNORE_DEPRECATED_PUSH #include <apt-pkg/vendor.h> #include <apt-pkg/vendorlist.h> @@ -163,6 +161,4 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput) /* } /*}}}*/ -#if __GNUC__ >= 4 - #pragma GCC diagnostic pop -#endif +APT_IGNORE_DEPRECATED_POP |