Merge remote-tracking branch 'donkult/debian/sid' into debian/sid

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

diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
dissimilarity index 60%
index 033bb96..2d2e2b0 100644 (file)
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -1,37 +1,37 @@
-#ifndef PKGLIB_VENDOR_H
-#define PKGLIB_VENDOR_H
-#include <string>
-#include <vector>
-#include <map>
-
-#ifdef __GNUG__
-#pragma interface "apt-pkg/vendor.h"
-#endif
-
-using std::string;
-
-// A class representing a particular software provider. 
-class Vendor
-{
-   public:
-   struct Fingerprint
-   {
-      string Print;
-      string Description;
-   };
-
-   protected:
-   string VendorID;
-   string Origin;
-   std::map<string, string> Fingerprints;
-
-   public:
-   Vendor(string VendorID, string Origin,
-          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 ~Vendor(){};
-};
-
-#endif
+#ifndef PKGLIB_VENDOR_H
+#define PKGLIB_VENDOR_H
+#include <string>
+#include <vector>
+#include <map>
+
+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+
+// A class representing a particular software provider.
+class APT_DEPRECATED Vendor
+{
+   public:
+   struct Fingerprint
+   {
+      std::string Print;
+      std::string Description;
+   };
+
+   protected:
+   std::string VendorID;
+   std::string Origin;
+   std::map<std::string, std::string> Fingerprints;
+
+   public:
+   Vendor(std::string VendorID, std::string Origin,
+          std::vector<struct Fingerprint *> *FingerprintList);
+   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(){};
+};
+
+#endif