Merge remote-tracking branch 'upstream/debian/experimental' into feature/no-more...

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

diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index d0392ebdb45222aa2495031c1938704fa2ae85c5..d4add560e7869e38608d69ed19c34aadf9c4deee 100644 (file)
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,12 +1,14 @@
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/vendor.h"
-#endif
+#include<config.h>
 
-#include <iostream>
-#include <apt-pkg/error.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)
@@ -14,7 +16,7 @@ Vendor::Vendor(std::string VendorID,
    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 \""
@@ -24,16 +26,16 @@ Vendor::Vendor(std::string VendorID,
    delete FingerprintList;
 }
 
-const string Vendor::LookupFingerprint(string Print) const
+const std::string Vendor::LookupFingerprint(std::string Print) const
 {
-   std::map<string,string>::const_iterator Elt = Fingerprints.find(Print);
+   std::map<std::string,std::string>::const_iterator Elt = Fingerprints.find(Print);
    if (Elt == Fingerprints.end())
       return "";
    else
       return (*Elt).second;
 }
 
-bool Vendor::CheckDist(string Dist)
+APT_CONST bool Vendor::CheckDist(std::string /*Dist*/)
 {
    return true;
 }