Merge remote-tracking branch 'mvo/feature/acq-trans' into debian/experimental

[apt.git] / apt-pkg / edsp / edspindexfile.h

diff --git a/apt-pkg/edsp/edspindexfile.h b/apt-pkg/edsp/edspindexfile.h
index 58a7f62a99ca6a72a4a07497ea27d33df6f45793..609a2cde4ddf375200a387d31912ec55abd7521d 100644 (file)
--- a/apt-pkg/edsp/edspindexfile.h
+++ b/apt-pkg/edsp/edspindexfile.h
@@ -8,8 +8,15 @@
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 
 #ifndef PKGLIB_EDSPINDEXFILE_H
 #define PKGLIB_EDSPINDEXFILE_H
 

-#include <apt-pkg/indexfile.h>

 #include <apt-pkg/debindexfile.h>
 #include <apt-pkg/debindexfile.h>

+#include <string>
+
+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/indexfile.h>
+#endif
+
+class OpProgress;
+class pkgCacheGenerator;

 
 class edspIndex : public debStatusIndex
 {
 
 class edspIndex : public debStatusIndex
 {


@@ -18,7 +25,7 @@ class edspIndex : public debStatusIndex
 
    public:
 
 
    public:
 

-   virtual const Type *GetType() const;
+   virtual const Type *GetType() const APT_CONST;

 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;
 
 
    virtual bool Merge(pkgCacheGenerator &Gen,OpProgress *Prog) const;