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

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

diff --git a/apt-pkg/indexfile.h b/apt-pkg/indexfile.h
index 68d53ad7e3e5e80aff525d897f5576efd2e6fdcb..1d34dc773bb3123cfef7681d76dc45b96568e93b 100644 (file)
--- a/apt-pkg/indexfile.h
+++ b/apt-pkg/indexfile.h
@@ -27,10 +27,16 @@
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>
 #include <apt-pkg/pkgcache.h>
 #include <apt-pkg/srcrecords.h>
 #include <apt-pkg/pkgrecords.h>

+#include <apt-pkg/macros.h>
+
+#ifndef APT_8_CLEANER_HEADERS
+using std::string;
+#endif

 
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;
 
 class pkgAcquire;
 class pkgCacheGenerator;
 class OpProgress;

+

 class pkgIndexFile
 {
    protected:
 class pkgIndexFile
 {
    protected: