aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eapi.cc
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-26 15:38:13 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 10:11:25 +0100
commitd03893141379f242baf6ccbe0e934ebabd1ce626 (patch)
tree62d41a98a0a3bc5aa77d5cc63e15c1102c4fbdee /paludis/repositories/e/eapi.cc
parent164f1c1f44aedebad33225803bfd56701d1eb82f (diff)
downloadpaludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.gz
paludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.xz
Merger -> FSMerger
Diffstat (limited to 'paludis/repositories/e/eapi.cc')
-rw-r--r--paludis/repositories/e/eapi.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/e/eapi.cc b/paludis/repositories/e/eapi.cc
index bcbbdc20e..31d4ba6b0 100644
--- a/paludis/repositories/e/eapi.cc
+++ b/paludis/repositories/e/eapi.cc
@@ -305,14 +305,14 @@ namespace
version_spec_options += destringify<VersionSpecOption>(*t);
}
- MergerOptions merger_options;
+ FSMergerOptions merger_options;
{
std::list<std::string> merger_options_tokens;
tokenise_whitespace(check_get(k, "merger_options"), std::back_inserter(merger_options_tokens));
for (std::list<std::string>::const_iterator t(merger_options_tokens.begin()),
t_end(merger_options_tokens.end()) ;
t != t_end ; ++t)
- merger_options += destringify<MergerOption>(*t);
+ merger_options += destringify<FSMergerOption>(*t);
}
return std::make_shared<SupportedEAPI>(make_named_values<SupportedEAPI>(