summaryrefslogtreecommitdiff
path: root/apt-inst/contrib/extracttar.h
diff options
context:
space:
mode:
authorDavid Kalnischkies <kalnischkies@gmail.com>2011-09-19 13:31:29 +0200
committerDavid Kalnischkies <kalnischkies@gmail.com>2011-09-19 13:31:29 +0200
commit8f3ba4e8708cb72be19dacc2af4f601ee5fea292 (patch)
treef624675aa3d4add287f253e19eb28c0dce5669f1 /apt-inst/contrib/extracttar.h
parentc333ea435b67d7d7d7d10e867298ecac4da0f7b8 (diff)
do not pollute namespace in the headers with using (Closes: #500198)
Diffstat (limited to 'apt-inst/contrib/extracttar.h')
-rw-r--r--apt-inst/contrib/extracttar.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/apt-inst/contrib/extracttar.h b/apt-inst/contrib/extracttar.h
index 42f8ef534..27c453d0d 100644
--- a/apt-inst/contrib/extracttar.h
+++ b/apt-inst/contrib/extracttar.h
@@ -19,8 +19,6 @@
#include <algorithm>
-using std::min;
-
class ExtractTar
{
protected:
@@ -38,7 +36,7 @@ class ExtractTar
int GZPid;
FileFd InFd;
bool Eof;
- string DecompressProg;
+ std::string DecompressProg;
// Fork and reap gzip
bool StartGzip();
@@ -48,7 +46,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();
};