merged the relevant bits from lp:~mvo/apt/lp346386

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 4cc500727bd8cf58010d59777e9184a3459c9935..ecfc7db878aa46c291933714d0103a15e494574c 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,13 +1,20 @@
+#include<config.h>
+

 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>
 #include <apt-pkg/fileutl.h>
 #include <apt-pkg/error.h>

+#include <apt-pkg/configuration.h>

 #include <apti18n.h>
 
 #if __GNUC__ >= 4
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
 #include <apti18n.h>
 
 #if __GNUC__ >= 4
        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 

+#include <apt-pkg/vendor.h>

 #include <apt-pkg/vendorlist.h>
 
 #include <apt-pkg/vendorlist.h>
 

+using std::string;
+using std::vector;
+

 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 pkgVendorList::~pkgVendorList()
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin();