[ABI-Break] remove the PACKAGE_MATCHER_ABI_COMPAT defines

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

diff --git a/apt-pkg/vendorlist.cc b/apt-pkg/vendorlist.cc
index 92ff3889448340688d14bc55f96f11194009eeaf..6024256241eef05fc041e85c4a15a1e0359e79a8 100644 (file)
--- a/apt-pkg/vendorlist.cc
+++ b/apt-pkg/vendorlist.cc
@@ -1,12 +1,24 @@
-#include <apt-pkg/vendorlist.h>
+#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>
 
 #include <apti18n.h>
 

+#if __GNUC__ >= 4
+       #pragma GCC diagnostic ignored "-Wdeprecated-declarations"
+#endif
+
+#include <apt-pkg/vendor.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(); 

-        I != VendorList.end(); I++)
+        I != VendorList.end(); ++I)

       delete *I;
 }
 
       delete *I;
 }
 


@@ -44,7 +56,7 @@ bool pkgVendorList::Read(string File)                                 /*{{{*/
 bool pkgVendorList::CreateList(Configuration& Cnf)                     /*{{{*/
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 
 bool pkgVendorList::CreateList(Configuration& Cnf)                     /*{{{*/
 {
    for (vector<const Vendor *>::const_iterator I = VendorList.begin(); 

-       I != VendorList.end(); I++)
+       I != VendorList.end(); ++I)

       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 
       delete *I;
    VendorList.erase(VendorList.begin(),VendorList.end());
 


@@ -54,7 +66,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");


@@ -124,7 +136,7 @@ const Vendor* pkgVendorList::LookupFingerprint(string Fingerprint)  /*{{{*/
                                                                        /*}}}*/
 const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)  /*{{{*/
 {
                                                                        /*}}}*/
 const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)  /*{{{*/
 {

-   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); I++)
+   for (std::vector<string>::const_iterator I = GPGVOutput.begin(); I != GPGVOutput.end(); ++I)

    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))
    {
       string::size_type pos = (*I).find("VALIDSIG ");
       if (_config->FindB("Debug::Vendor", false))


@@ -143,3 +155,7 @@ const Vendor* pkgVendorList::FindVendor(const std::vector<string> GPGVOutput)       /*
    return NULL;
 }
                                                                        /*}}}*/
    return NULL;
 }
                                                                        /*}}}*/

+
+#if __GNUC__ >= 4
+       #pragma GCC diagnostic warning "-Wdeprecated-declarations"
+#endif