Merge branch 'feature/test-apt-key-net-update' into debian/sid

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

diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 2d39fd15f391f21e62c087f25395d5d1329d8c7d..6484adf9b0e54845a0cec03a53164ba30b081721 100644 (file)
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -4,30 +4,33 @@
 #include <vector>
 #include <map>
 
 #include <vector>
 #include <map>
 

+#include <apt-pkg/macros.h>

 
 

+#ifndef APT_8_CLEANER_HEADERS

 using std::string;
 using std::string;

+#endif

 
 

-// A class representing a particular software provider. 
-class Vendor
+// A class representing a particular software provider.
+class __deprecated Vendor

 {
    public:
    struct Fingerprint
    {
 {
    public:
    struct Fingerprint
    {

-      string Print;
-      string Description;
+      std::string Print;
+      std::string Description;

    };
 
    protected:
    };
 
    protected:

-   string VendorID;
-   string Origin;
-   std::map<string, string> Fingerprints;
+   std::string VendorID;
+   std::string Origin;
+   std::map<std::string, std::string> Fingerprints;

 
    public:
 
    public:

-   Vendor(string VendorID, string Origin,
+   Vendor(std::string VendorID, std::string Origin,

           std::vector<struct Fingerprint *> *FingerprintList);
           std::vector<struct Fingerprint *> *FingerprintList);

-   virtual const string& GetVendorID() const { return VendorID; };
-   virtual const string LookupFingerprint(string Print) const;
-   virtual bool CheckDist(string Dist);
+   virtual const std::string& GetVendorID() const { return VendorID; };
+   virtual const std::string LookupFingerprint(std::string Print) const;
+   virtual bool CheckDist(std::string Dist);

    virtual ~Vendor(){};
 };
 
    virtual ~Vendor(){};
 };