aboutsummaryrefslogtreecommitdiff
path: root/paludis/paludislike_options_conf.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-24 11:40:46 +0100
commit637a8d521b304dec1ec4db201d5d71d509efb6c1 (patch)
treefa4f7f5b0537c7f7361e4d76341b53d121c5d003 /paludis/paludislike_options_conf.cc
parentd3b974490cf7482b034f1a6779b65e411616f84c (diff)
downloadpaludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.gz
paludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.xz
Make use of Options init lists
Diffstat (limited to 'paludis/paludislike_options_conf.cc')
-rw-r--r--paludis/paludislike_options_conf.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/paludis/paludislike_options_conf.cc b/paludis/paludislike_options_conf.cc
index dc70fd664..393ee62a4 100644
--- a/paludis/paludislike_options_conf.cc
+++ b/paludis/paludislike_options_conf.cc
@@ -179,7 +179,7 @@ PaludisLikeOptionsConf::add_file(const FSEntry & f)
{
Context context("When adding '" + stringify(f) + "':");
- const std::shared_ptr<const LineConfigFile> file(_imp->params.make_config_file()(f, LineConfigFileOptions()));
+ const std::shared_ptr<const LineConfigFile> file(_imp->params.make_config_file()(f, { }));
if (! file)
return;
@@ -197,7 +197,7 @@ PaludisLikeOptionsConf::add_file(const FSEntry & f)
{
std::shared_ptr<PackageDepSpec> d(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
tokens.at(0), _imp->params.environment(),
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set)));
+ { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set })));
if (d->additional_requirements_ptr())
{
@@ -426,7 +426,7 @@ namespace
{
if (maybe_id)
{
- if (! match_package(*env, i->spec(), *maybe_id, MatchPackageOptions()))
+ 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, MatchPackageOptions()))
+ 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, MatchPackageOptions()))
+ *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, MatchPackageOptions()))
+ 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, MatchPackageOptions()))
+ *maybe_id, { }))
continue;
collect_known_from_values_groups(_imp->params.environment(), maybe_id, prefix, r->values_groups(), result);