aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/exheres_profile.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/repositories/e/exheres_profile.cc
parentd3b974490cf7482b034f1a6779b65e411616f84c (diff)
downloadpaludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.gz
paludis-637a8d521b304dec1ec4db201d5d71d509efb6c1.tar.xz
Make use of Options init lists
Diffstat (limited to 'paludis/repositories/e/exheres_profile.cc')
-rw-r--r--paludis/repositories/e/exheres_profile.cc9
1 files changed, 4 insertions, 5 deletions
diff --git a/paludis/repositories/e/exheres_profile.cc b/paludis/repositories/e/exheres_profile.cc
index 7796de6..ace0fbe 100644
--- a/paludis/repositories/e/exheres_profile.cc
+++ b/paludis/repositories/e/exheres_profile.cc
@@ -215,7 +215,7 @@ ExheresProfile::_load_dir(const FSEntry & f)
if ((f / "parents.conf").exists())
{
- LineConfigFile file(f / "parents.conf", LineConfigFileOptions());
+ LineConfigFile file(f / "parents.conf", { });
for (LineConfigFile::ConstIterator line(file.begin()), line_end(file.end()) ;
line != line_end ; ++line)
_load_dir((f / *line).realpath());
@@ -238,9 +238,8 @@ ExheresProfile::_load_dir(const FSEntry & f)
throw ERepositoryConfigurationError("Can't use profile directory '" + stringify(f) +
"' because it uses an unsupported EAPI");
- KeyValueConfigFile file(f / "make.defaults", KeyValueConfigFileOptions() +
- kvcfo_disallow_source + kvcfo_disallow_space_inside_unquoted_values +
- kvcfo_allow_inline_comments + kvcfo_allow_multiple_assigns_per_line,
+ KeyValueConfigFile file(f / "make.defaults", { kvcfo_disallow_source, kvcfo_disallow_space_inside_unquoted_values,
+ kvcfo_allow_inline_comments, kvcfo_allow_multiple_assigns_per_line },
&KeyValueConfigFile::no_defaults, &KeyValueConfigFile::no_transformation);
for (KeyValueConfigFile::ConstIterator k(file.begin()), k_end(file.end()) ;
@@ -366,7 +365,7 @@ ExheresProfile::profile_masked(const PackageID & id) const
{
for (std::list<std::pair<std::shared_ptr<const PackageDepSpec>, std::shared_ptr<const RepositoryMaskInfo> > >::const_iterator k(rr->second.begin()),
k_end(rr->second.end()) ; k != k_end ; ++k)
- if (match_package(*_imp->env, *k->first, id, MatchPackageOptions()))
+ if (match_package(*_imp->env, *k->first, id, { }))
return k->second;
}