aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/eapi.hh
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.hh
parent164f1c1f44aedebad33225803bfd56701d1eb82f (diff)
downloadpaludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.gz
paludis-d03893141379f242baf6ccbe0e934ebabd1ce626.tar.xz
Merger -> FSMerger
Diffstat (limited to 'paludis/repositories/e/eapi.hh')
-rw-r--r--paludis/repositories/e/eapi.hh4
1 files changed, 2 insertions, 2 deletions
diff --git a/paludis/repositories/e/eapi.hh b/paludis/repositories/e/eapi.hh
index ffee931a3..8029fec96 100644
--- a/paludis/repositories/e/eapi.hh
+++ b/paludis/repositories/e/eapi.hh
@@ -30,7 +30,7 @@
#include <paludis/util/singleton.hh>
#include <paludis/name.hh>
#include <paludis/dep_spec-fwd.hh>
-#include <paludis/merger-fwd.hh>
+#include <paludis/fs_merger-fwd.hh>
#include <memory>
namespace paludis
@@ -272,7 +272,7 @@ namespace paludis
NamedValue<n::ebuild_options, std::shared_ptr<const EAPIEbuildOptions> > ebuild_options;
NamedValue<n::ebuild_phases, std::shared_ptr<const EAPIEbuildPhases> > ebuild_phases;
NamedValue<n::iuse_flag_parse_options, IUseFlagParseOptions> iuse_flag_parse_options;
- NamedValue<n::merger_options, MergerOptions> merger_options;
+ NamedValue<n::merger_options, FSMergerOptions> merger_options;
NamedValue<n::package_dep_spec_parse_options, ELikePackageDepSpecOptions> package_dep_spec_parse_options;
NamedValue<n::pipe_commands, std::shared_ptr<const EAPIPipeCommands> > pipe_commands;
NamedValue<n::tools_options, std::shared_ptr<const EAPIToolsOptions> > tools_options;