aboutsummaryrefslogtreecommitdiff
path: root/paludis/environments/paludis/package_mask_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/environments/paludis/package_mask_conf.cc
parentd3b974490cf7482b034f1a6779b65e411616f84c (diff)
downloadpaludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.gz
paludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.xz
Make use of Options init lists
Diffstat (limited to 'paludis/environments/paludis/package_mask_conf.cc')
-rw-r--r--paludis/environments/paludis/package_mask_conf.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/paludis/environments/paludis/package_mask_conf.cc b/paludis/environments/paludis/package_mask_conf.cc
index fb0bbb303..49df819a4 100644
--- a/paludis/environments/paludis/package_mask_conf.cc
+++ b/paludis/environments/paludis/package_mask_conf.cc
@@ -77,7 +77,7 @@ PackageMaskConf::add(const FSEntry & filename)
{
Context context("When adding source '" + stringify(filename) + "' as a package mask or unmask file:");
- std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, LineConfigFileOptions()));
+ std::shared_ptr<LineConfigFile> f(make_bashable_conf(filename, { }));
if (! f)
return;
@@ -88,7 +88,7 @@ PackageMaskConf::add(const FSEntry & filename)
{
_imp->masks.push_back(std::shared_ptr<PackageDepSpec>(std::make_shared<PackageDepSpec>(parse_user_package_dep_spec(
*line, _imp->env,
- UserPackageDepSpecOptions() + updso_allow_wildcards + updso_no_disambiguation + updso_throw_if_set))));
+ { updso_allow_wildcards, updso_no_disambiguation, updso_throw_if_set }))));
}
catch (const GotASetNotAPackageDepSpec &)
{
@@ -124,7 +124,7 @@ PackageMaskConf::query(const PackageID & e) const
}
}
- if (match_package_in_set(*_imp->env, *it->second, e, MatchPackageOptions()))
+ if (match_package_in_set(*_imp->env, *it->second, e, { }))
return true;
}
}