merged from lp:~donkult/apt/sid

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

diff --git a/apt-pkg/vendor.cc b/apt-pkg/vendor.cc
index d0392ebdb45222aa2495031c1938704fa2ae85c5..36fc2595714c6171c004e8bc9f5a19b2e762d06a 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>
 
 #include <iostream>
 #include <apt-pkg/error.h>


@@ -24,16 +22,16 @@ Vendor::Vendor(std::string VendorID,
    delete FingerprintList;
 }
 
    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;
 }
 
    if (Elt == Fingerprints.end())
       return "";
    else
       return (*Elt).second;
 }
 

-bool Vendor::CheckDist(string Dist)
+bool Vendor::CheckDist(std::string Dist)

 {
    return true;
 }
 {
    return true;
 }