diff options
| author | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:32:52 +0100 |
|---|---|---|
| committer | Michael Vogt <michael.vogt@ubuntu.com> | 2011-11-10 16:32:52 +0100 |
| commit | 71ecaad29d8066a494f516efc5efd80860653fe2 (patch) | |
| tree | b0769df88e2b6496f23e3d899aeb1c240a3488d9 /apt-inst/contrib/extracttar.h | |
| parent | a865ed25fa54514224cf4d6f83dd9cf48b7ed02b (diff) | |
| parent | 37adedc9d0b66eeae7efb88aebd08dfbc6e06f77 (diff) | |
merged from http://bzr.debian.org/bzr/apt/apt/debian-experimental2
Diffstat (limited to 'apt-inst/contrib/extracttar.h')
| -rw-r--r-- | apt-inst/contrib/extracttar.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h index 42f8ef534..8754e8dcc 100644 --- a/apt-inst/contrib/extracttar.h +++ b/apt-inst/contrib/extracttar.h @@ -15,11 +15,10 @@ #define PKGLIB_EXTRACTTAR_H #include <apt-pkg/fileutl.h> -#include <apt-pkg/dirstream.h> -#include <algorithm> +#include <string> -using std::min; +class pkgDirStream; class ExtractTar { @@ -38,7 +37,7 @@ class ExtractTar int GZPid; FileFd InFd; bool Eof; - string DecompressProg; + std::string DecompressProg; // Fork and reap gzip bool StartGzip(); @@ -48,7 +47,7 @@ class ExtractTar bool Go(pkgDirStream &Stream); - ExtractTar(FileFd &Fd,unsigned long Max,string DecompressionProgram); + ExtractTar(FileFd &Fd,unsigned long Max,std::string DecompressionProgram); virtual ~ExtractTar(); }; |