merge with my debian-sid branch

[apt.git] / ftparchive / contents.h

diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index f549ce17fce7b407ffa47eecde2705ee0ba30609..4af9db574b79168f41d5e6a3f097443855287bd4 100644 (file)
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -12,9 +12,10 @@
     
 #include <stdlib.h>
 #include <stdio.h>
-#include <apt-pkg/debfile.h>
 #include <apt-pkg/dirstream.h>
 
+class debDebFile;
+
 class GenContents
 {
    struct Node
@@ -80,7 +81,7 @@ class ContentsExtract : public pkgDirStream
    virtual bool DoItem(Item &Itm,int &Fd);      
    void Reset() {CurSize = 0;};
    bool TakeContents(const void *Data,unsigned long long Length);
-   void Add(GenContents &Contents,string const &Package);
+   void Add(GenContents &Contents,std::string const &Package);
    
    ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {};
    virtual ~ContentsExtract() {delete [] Data;};