aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-24 10:43:11 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2006-01-24 10:43:11 +0000
commit683e96190454ee106fb5cabe456ba1db1765d4be (patch)
tree4bb89e79f9f13d3d297004abc124978e1b3defbc
parent1fe17ec766f9c911f4eeaa6c8bba77e9714a55df (diff)
downloadpaludis-683e96190454ee106fb5cabe456ba1db1765d4be.tar.gz
paludis-683e96190454ee106fb5cabe456ba1db1765d4be.tar.xz
std::make_pair("foo", "bar") is illegal, although libstdc++ lets us get away with it. Explicitly create the strings anyway.
-rw-r--r--paludis/fake_repository.cc2
-rw-r--r--paludis/portage_repository.cc8
2 files changed, 5 insertions, 5 deletions
diff --git a/paludis/fake_repository.cc b/paludis/fake_repository.cc
index b4a914c..d85bd89 100644
--- a/paludis/fake_repository.cc
+++ b/paludis/fake_repository.cc
@@ -58,7 +58,7 @@ FakeRepository::FakeRepository(const RepositoryName & name) :
Repository(name),
PrivateImplementationPattern<FakeRepository>(new Implementation<FakeRepository>)
{
- _info.insert(std::make_pair("format", "fake"));
+ _info.insert(std::make_pair(std::string("format"), std::string("fake")));
}
FakeRepository::~FakeRepository()
diff --git a/paludis/portage_repository.cc b/paludis/portage_repository.cc
index 36eed47..5469e23 100644
--- a/paludis/portage_repository.cc
+++ b/paludis/portage_repository.cc
@@ -202,10 +202,10 @@ PortageRepository::PortageRepository(const PackageDatabase * const d,
PrivateImplementationPattern<PortageRepository>(new Implementation<PortageRepository>(
d, location, profile, cache))
{
- _info.insert(std::make_pair("location", location));
- _info.insert(std::make_pair("profile", profile));
- _info.insert(std::make_pair("cache", cache));
- _info.insert(std::make_pair("format", "portage"));
+ _info.insert(std::make_pair(std::string("location"), location));
+ _info.insert(std::make_pair(std::string("profile"), profile));
+ _info.insert(std::make_pair(std::string("cache"), cache));
+ _info.insert(std::make_pair(std::string("format"), std::string("portage")));
}
PortageRepository::~PortageRepository()