aboutsummaryrefslogtreecommitdiff
path: root/paludis/paludislike_options_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-12-27 23:54:51 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-01-01 03:57:52 +0000
commit97c38fc7c02260a2d213d9a16d878a0410b9d57a (patch)
treefef7c8137e22b2582acb3b66496ced9aa4135897 /paludis/paludislike_options_conf.cc
parenta1b11d059009182f19bf9cf23e060dee752d4632 (diff)
downloadpaludis-97c38fc7c02260a2d213d9a16d878a0410b9d57a.tar.gz
paludis-97c38fc7c02260a2d213d9a16d878a0410b9d57a.tar.xz
Pass PackageIDs by shared_ptr
Diffstat (limited to 'paludis/paludislike_options_conf.cc')
-rw-r--r--paludis/paludislike_options_conf.cc10
1 files changed, 5 insertions, 5 deletions
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index db65766bf..b9f1023c0 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -426,7 +426,7 @@ namespace
{
if (maybe_id)
{
- if (! match_package(*env, i->spec(), *maybe_id, { }))
+ if (! match_package(*env, i->spec(), maybe_id, { }))
continue;
}
else
@@ -453,7 +453,7 @@ namespace
{
if (maybe_id)
{
- if (! match_package(*env, i->spec(), *maybe_id, { }))
+ if (! match_package(*env, i->spec(), maybe_id, { }))
continue;
}
else
@@ -502,7 +502,7 @@ PaludisLikeOptionsConf::want_choice_enabled_locked(
r != r_end ; ++r)
{
if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(),
- *maybe_id, { }))
+ maybe_id, { }))
continue;
check_values_groups(_imp->params.environment(), maybe_id, prefix, unprefixed_name, r->values_groups(),
@@ -561,7 +561,7 @@ PaludisLikeOptionsConf::value_for_choice_parameter(
for (SetNamesWithValuesGroups::const_iterator r(_imp->set_specs.begin()), r_end(_imp->set_specs.end()) ;
r != r_end ; ++r)
{
- if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(), *id, { }))
+ if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(), id, { }))
continue;
check_values_groups(_imp->params.environment(), id, prefix, unprefixed_name, r->values_groups(),
@@ -607,7 +607,7 @@ PaludisLikeOptionsConf::known_choice_value_names(
r != r_end ; ++r)
{
if (! match_package_in_set(*_imp->params.environment(), *r->set_value().value().value(),
- *maybe_id, { }))
+ maybe_id, { }))
continue;
collect_known_from_values_groups(_imp->params.environment(), maybe_id, prefix, r->values_groups(), result);