summaryrefslogtreecommitdiff
path: root/apt-pkg/init.cc
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/init.cc
parentc333ea435b67d7d7d7d10e867298ecac4da0f7b8 (diff)
downloadapt-8f3ba4e8708cb72be19dacc2af4f601ee5fea292.tar.gz
do not pollute namespace in the headers with using (Closes: #500198)
Diffstat (limited to 'apt-pkg/init.cc')
-rw-r--r--apt-pkg/init.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 97a39e96e..a1cb05e38 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -108,14 +108,14 @@ bool pkgInitConfig(Configuration &Cnf)
}
// Read the configuration parts dir
- string Parts = Cnf.FindDir("Dir::Etc::parts");
+ std::string Parts = Cnf.FindDir("Dir::Etc::parts");
if (DirectoryExists(Parts) == true)
Res &= ReadConfigDir(Cnf,Parts);
else
_error->WarningE("DirectoryExists",_("Unable to read %s"),Parts.c_str());
// Read the main config file
- string FName = Cnf.FindFile("Dir::Etc::main");
+ std::string FName = Cnf.FindFile("Dir::Etc::main");
if (RealFileExists(FName) == true)
Res &= ReadConfigFile(Cnf,FName);
@@ -142,7 +142,7 @@ bool pkgInitConfig(Configuration &Cnf)
bool pkgInitSystem(Configuration &Cnf,pkgSystem *&Sys)
{
Sys = 0;
- string Label = Cnf.Find("Apt::System","");
+ std::string Label = Cnf.Find("Apt::System","");
if (Label.empty() == false)
{
Sys = pkgSystem::GetSystem(Label.c_str());