cleanup the hash iteration. unfortunately there is no 1:1 mapping from Hashes::Suppor...

[apt.git] / apt-inst / contrib / extracttar.h

diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 6daf00a275f4793dccce69015b74fcc2d6beb8c3..4b29df3141ae71dfbd54c08fae1b5f381f17a899 100644 (file)
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -14,16 +14,17 @@
 #ifndef PKGLIB_EXTRACTTAR_H
 #define PKGLIB_EXTRACTTAR_H
 
 #ifndef PKGLIB_EXTRACTTAR_H
 #define PKGLIB_EXTRACTTAR_H
 

-#ifdef __GNUG__
-#pragma interface "apt-pkg/extracttar.h"
-#endif
-

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

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

 
 

-#include <algorithm>
+#include <string>

 
 

+#ifndef APT_8_CLEANER_HEADERS
+#include <apt-pkg/dirstream.h>
+#include <algorithm>

 using std::min;
 using std::min;

+#endif
+
+class pkgDirStream;

 
 class ExtractTar
 {
 
 class ExtractTar
 {


@@ -42,7 +43,7 @@ class ExtractTar
    int GZPid;
    FileFd InFd;
    bool Eof;
    int GZPid;
    FileFd InFd;
    bool Eof;

-   string DecompressProg;
+   std::string DecompressProg;

    
    // Fork and reap gzip
    bool StartGzip();
    
    // Fork and reap gzip
    bool StartGzip();


@@ -52,7 +53,7 @@ class ExtractTar
 
    bool Go(pkgDirStream &Stream);
    
 
    bool Go(pkgDirStream &Stream);
    

-   ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram);
+   ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram);

    virtual ~ExtractTar();
 };
 
    virtual ~ExtractTar();
 };