From 8f3ba4e8708cb72be19dacc2af4f601ee5fea292 Mon Sep 17 00:00:00 2001
From: David Kalnischkies <kalnischkies@gmail.com>
Date: Mon, 19 Sep 2011 13:31:29 +0200
Subject: do not pollute namespace in the headers with using (Closes: #500198)

---
 apt-inst/contrib/arfile.cc    | 2 +-
 apt-inst/contrib/arfile.h     | 2 +-
 apt-inst/contrib/extracttar.h | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

(limited to 'apt-inst/contrib')

diff --git a/apt-inst/contrib/arfile.cc b/apt-inst/contrib/arfile.cc
index 533c563f9..4e078349e 100644
--- a/apt-inst/contrib/arfile.cc
+++ b/apt-inst/contrib/arfile.cc
@@ -115,7 +115,7 @@ bool ARArchive::LoadHeaders()
       {
 	 unsigned int I = sizeof(Head.Name) - 1;
 	 for (; Head.Name[I] == ' ' || Head.Name[I] == '/'; I--);
-	 Memb->Name = string(Head.Name,I+1);
+	 Memb->Name = std::string(Head.Name,I+1);
       }
 
       // Account for the AR header alignment 
diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h
index e2063cd71..bfc128ace 100644
--- a/apt-inst/contrib/arfile.h
+++ b/apt-inst/contrib/arfile.h
@@ -49,7 +49,7 @@ class ARArchive
 struct ARArchive::Member
 {
    // Fields from the header
-   string Name;
+   std::string Name;
    unsigned long MTime;
    unsigned long UID;
    unsigned long GID;
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();
 };
 
-- 
cgit v1.2.3