Merge remote-tracking branch 'mvo/feature/no-more-acquire-guessing' into debian/exper...

[apt.git] / apt-pkg / vendorlist.cc

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 6024256241eef05fc041e85c4a15a1e0359e79a8..fb33ff17d97f20f85a3cfcc9128cc7e7c98f7a8b 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -3,9 +3,16 @@
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/configuration.h>
+
+#include <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
+
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
+       #pragma GCC diagnostic push
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
@@ -157,5 +164,5 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)       /*
                                                                        /*}}}*/
 
 #if __GNUC__ >= 4
-       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+       #pragma GCC diagnostic pop
 #endif