Merge branch 'debian/jessie' into debian/experimental

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

diff --git a/apt-pkg/vendor.h b/apt-pkg/vendor.h
index 9b157378cc47d63c2d4f8fe269ecc7cb27fb0810..2d2e2b0aefd5ee42f487fe4dcc747e7d8aeb77c3 100644 (file)
--- a/apt-pkg/vendor.h
+++ b/apt-pkg/vendor.h
@@ -6,8 +6,12 @@
 
 #include <apt-pkg/macros.h>
 
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif
+
 // A class representing a particular software provider.
-class __deprecated Vendor
+class APT_DEPRECATED Vendor
 {
    public:
    struct Fingerprint