Merge remote-tracking branch 'mvo/feature/apt-update-info' into debian/sid

[apt.git] / ftparchive / contents.h

diff --git a/ftparchive/contents.h b/ftparchive/contents.h
index 4af9db574b79168f41d5e6a3f097443855287bd4..f58e3278ec14f9cd521bc1aea0cf8e93d2e129e8 100644 (file)
--- a/ftparchive/contents.h
+++ b/ftparchive/contents.h
@@ -9,11 +9,13 @@
                                                                        /*}}}*/
 #ifndef CONTENTS_H
 #define CONTENTS_H
                                                                        /*}}}*/
 #ifndef CONTENTS_H
 #define CONTENTS_H

-    
-#include <stdlib.h>
-#include <stdio.h>
+

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

+#include <stddef.h>
+#include <stdio.h>
+#include <string>
+

 class debDebFile;
 
 class GenContents
 class debDebFile;
 
 class GenContents


@@ -83,8 +85,8 @@ class ContentsExtract : public pkgDirStream
    bool TakeContents(const void *Data,unsigned long long Length);
    void Add(GenContents &Contents,std::string const &Package);
    
    bool TakeContents(const void *Data,unsigned long long Length);
    void Add(GenContents &Contents,std::string const &Package);
    

-   ContentsExtract() : Data(0), MaxSize(0), CurSize(0) {};
-   virtual ~ContentsExtract() {delete [] Data;};
+   ContentsExtract();
+   virtual ~ContentsExtract();

 };
 
 #endif
 };
 
 #endif