diff options
| author |  Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-12 14:28:03 +0100 |
|---|---|---|
| committer | Ciaran McCreesh <ciaran.mccreesh@googlemail.com>
| 2011-04-12 14:45:22 +0100 |
| commit | 120c58323950219e16d8fe22693af221d2887f9b (patch) | |
| tree | 2df48534abea1af807750dbbd0ce3ac9922bd44b /paludis/environments/paludis | |
| parent | 271074eb112e276d5ba25f91785431911ee3443f (diff) | |
| download | paludis-120c58323950219e16d8fe22693af221d2887f9b.tar.gz paludis-120c58323950219e16d8fe22693af221d2887f9b.tar.xz | |
MetadataKey value -> parse_value
Diffstat (limited to 'paludis/environments/paludis')
| -rw-r--r-- | paludis/environments/paludis/output_conf.cc | 2 | ||||
| -rw-r--r-- | paludis/environments/paludis/paludis_environment_TEST.cc | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/paludis/environments/paludis/output_conf.cc b/paludis/environments/paludis/output_conf.cc index 2f3ebfaf3..0f68207a7 100644 --- a/paludis/environments/paludis/output_conf.cc +++ b/paludis/environments/paludis/output_conf.cc @@ -275,7 +275,7 @@ namespace m->insert("id", escape(stringify(*i.package_id()))); m->insert("full_name", escape(stringify(*i.package_id()))); if (i.package_id()->slot_key()) - m->insert("slot", stringify(i.package_id()->slot_key()->value())); + m->insert("slot", stringify(i.package_id()->slot_key()->parse_value())); m->insert("version", stringify(i.package_id()->version())); m->insert("repository", stringify(i.package_id()->repository_name())); m->insert("category", stringify(i.package_id()->name().category())); diff --git a/paludis/environments/paludis/paludis_environment_TEST.cc b/paludis/environments/paludis/paludis_environment_TEST.cc index ef5d28ab2..7421ba780 100644 --- a/paludis/environments/paludis/paludis_environment_TEST.cc +++ b/paludis/environments/paludis/paludis_environment_TEST.cc @@ -46,7 +46,7 @@ namespace { bool get_use(const std::string & f, const std::shared_ptr<const PackageID> & id) { - const std::shared_ptr<const ChoiceValue> v(id->choices_key()->value()->find_by_name_with_prefix(ChoiceNameWithPrefix(f))); + const std::shared_ptr<const ChoiceValue> v(id->choices_key()->parse_value()->find_by_name_with_prefix(ChoiceNameWithPrefix(f))); if (! v) return false; return v->enabled(); @@ -92,7 +92,8 @@ TEST(PaludisEnvironment, KnownUse) PackageDepSpec(parse_user_package_dep_spec("=cat-one/pkg-one-1", env.get(), { })), make_null_shared_ptr(), { }))]->begin()); std::shared_ptr<const Choice> foo_cards; - for (Choices::ConstIterator c(id1->choices_key()->value()->begin()), c_end(id1->choices_key()->value()->end()) ; + auto choices(id1->choices_key()->parse_value()); + for (Choices::ConstIterator c(choices->begin()), c_end(choices->end()) ; c != c_end ; ++c) if ((*c)->raw_name() == "FOO_CARDS") foo_cards = *c; |