Merge branch 'debian/sid' into debian/experimental

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

diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index 36fc2595714c6171c004e8bc9f5a19b2e762d06a..d4add560e7869e38608d69ed19c34aadf9c4deee 100644 (file)
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,10 +1,14 @@
 #include<config.h>
 
 #include<config.h>
 

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

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

+#include <iostream>
+#include <map>
+#include <string>
+#include <utility>
+#include <vector>
+

 Vendor::Vendor(std::string VendorID,
                std::string Origin,
               std::vector<struct Vendor::Fingerprint *> *FingerprintList)
 Vendor::Vendor(std::string VendorID,
                std::string Origin,
               std::vector<struct Vendor::Fingerprint *> *FingerprintList)


@@ -12,7 +16,7 @@ Vendor::Vendor(std::string VendorID,
    this->VendorID = VendorID;
    this->Origin = Origin;
    for (std::vector<struct Vendor::Fingerprint *>::iterator I = FingerprintList->begin();
    this->VendorID = VendorID;
    this->Origin = Origin;
    for (std::vector<struct Vendor::Fingerprint *>::iterator I = FingerprintList->begin();

-       I != FingerprintList->end(); I++)
+       I != FingerprintList->end(); ++I)

    {
       if (_config->FindB("Debug::Vendor", false))
          std::cerr << "Vendor \"" << VendorID << "\": Mapping \""
    {
       if (_config->FindB("Debug::Vendor", false))
          std::cerr << "Vendor \"" << VendorID << "\": Mapping \""


@@ -31,7 +35,7 @@ const std::string Vendor::LookupFingerprint(std::string Print) const
       return (*Elt).second;
 }
 
       return (*Elt).second;
 }
 

-bool Vendor::CheckDist(std::string Dist)
+APT_CONST bool Vendor::CheckDist(std::string /*Dist*/)

 {
    return true;
 }
 {
    return true;
 }