summaryrefslogtreecommitdiff
path: root/apt-pkg/packagemanager.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-pkg/packagemanager.h
parentc333ea435b67d7d7d7d10e867298ecac4da0f7b8 (diff)
do not pollute namespace in the headers with using (Closes: #500198)
Diffstat (limited to 'apt-pkg/packagemanager.h')
-rw-r--r--apt-pkg/packagemanager.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/apt-pkg/packagemanager.h b/apt-pkg/packagemanager.h
index 96dc5f236..7ee17942c 100644
--- a/apt-pkg/packagemanager.h
+++ b/apt-pkg/packagemanager.h
@@ -30,8 +30,6 @@
#include <apt-pkg/depcache.h>
#include <set>
-using std::string;
-
class pkgAcquire;
class pkgDepCache;
class pkgSourceList;
@@ -45,7 +43,7 @@ class pkgPackageManager : protected pkgCache::Namespace
static bool SigINTStop;
protected:
- string *FileNames;
+ std::string *FileNames;
pkgDepCache &Cache;
pkgOrderList *List;
bool Debug;
@@ -78,7 +76,7 @@ class pkgPackageManager : protected pkgCache::Namespace
bool EarlyRemove(PkgIterator Pkg);
// The Actual installation implementation
- virtual bool Install(PkgIterator /*Pkg*/,string /*File*/) {return false;};
+ virtual bool Install(PkgIterator /*Pkg*/,std::string /*File*/) {return false;};
virtual bool Configure(PkgIterator /*Pkg*/) {return false;};
virtual bool Remove(PkgIterator /*Pkg*/,bool /*Purge*/=false) {return false;};
virtual bool Go(int statusFd=-1) {return true;};