releasing package apt version 1.1~exp1

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 731f11acf52a43bc27c15ff43fca71953e5de517..fb33ff17d97f20f85a3cfcc9128cc7e7c98f7a8b 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -2,14 +2,26 @@
 
 #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 <stddef.h>
+#include <iostream>
+#include <string>
+#include <vector>
+

 #include <apti18n.h>
 
 #if __GNUC__ >= 4
 #include <apti18n.h>
 
 #if __GNUC__ >= 4

+       #pragma GCC diagnostic push

        #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
 #endif
 
        #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(); 


@@ -61,7 +73,7 @@ bool pkgVendorList::CreateList(Configuration& Cnf)                    /*{{{*/
       Configuration Block(Top);
       string VendorID = Top->Tag;
       vector <struct Vendor::Fingerprint *> *Fingerprints = new vector<Vendor::Fingerprint *>;
       Configuration Block(Top);
       string VendorID = Top->Tag;
       vector <struct Vendor::Fingerprint *> *Fingerprints = new vector<Vendor::Fingerprint *>;

-      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint;
+      struct Vendor::Fingerprint *Fingerprint = new struct Vendor::Fingerprint();

       string Origin = Block.Find("Origin");
 
       Fingerprint->Print = Block.Find("Fingerprint");
       string Origin = Block.Find("Origin");
 
       Fingerprint->Print = Block.Find("Fingerprint");


@@ -152,5 +164,5 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)       /*
                                                                        /*}}}*/
 
 #if __GNUC__ >= 4
                                                                        /*}}}*/
 
 #if __GNUC__ >= 4

-       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+       #pragma GCC diagnostic pop

 #endif
 #endif