merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used...

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

diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index d0392ebdb45222aa2495031c1938704fa2ae85c5..fc03ec84583319e1509fbbea06c3a0628e3e61b8 100644 (file)
--- a/apt-pkg/vendor.cc
+++ b/apt-pkg/vendor.cc
@@ -1,6 +1,4 @@
-#ifdef __GNUG__
-#pragma implementation "apt-pkg/vendor.h"
-#endif
+#include<config.h>
 
 #include <iostream>
 #include <apt-pkg/error.h>
@@ -14,7 +12,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 +22,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)
+bool Vendor::CheckDist(std::string Dist)
 {
    return true;
 }