aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-26 17:14:57 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-28 10:11:26 +0100
commitce13a6f9defe83fccd8424027ef1e24ca33b8cc2 (patch)
treebe57dccfba4c2e6a3f574f1d9000f85a2d09fe8c /paludis/ndbam_merger.hh
parentd03893141379f242baf6ccbe0e934ebabd1ce626 (diff)
downloadpaludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.gz
paludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.xz
Add Merger base class
Diffstat (limited to 'paludis/ndbam_merger.hh')
-rw-r--r--paludis/ndbam_merger.hh2
1 files changed, 1 insertions, 1 deletions
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 4f7b09c..04ac67d 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -56,7 +56,7 @@ namespace paludis
NamedValue<n::image, FSEntry> image;
NamedValue<n::install_under, FSEntry> install_under;
NamedValue<n::merged_entries, std::shared_ptr<FSEntrySet> > merged_entries;
- NamedValue<n::options, FSMergerOptions> options;
+ NamedValue<n::options, MergerOptions> options;
NamedValue<n::output_manager, std::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::root, FSEntry> root;