aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-16 17:30:50 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2008-04-16 17:30:50 +0000
commit71f51bec18597201fd242a8d6d1901376f13091c (patch)
tree3d01d2a56414794aa839c870be1acee12addc705 /paludis/ndbam_merger.hh
parentb927d07db9dcd86f7aadca7990ac410493167956 (diff)
downloadpaludis-71f51bec18597201fd242a8d6d1901376f13091c.tar.gz
paludis-71f51bec18597201fd242a8d6d1901376f13091c.tar.xz
Fix 3.4 compile
Diffstat (limited to 'paludis/ndbam_merger.hh')
-rw-r--r--paludis/ndbam_merger.hh14
1 files changed, 13 insertions, 1 deletions
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index ea64c67..5f8e3d0 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -22,10 +22,22 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
+#include <paludis/util/kc-fwd.hh>
+#include <paludis/util/keys.hh>
namespace paludis
{
-#include <paludis/ndbam_merger-sr.hh>
+ typedef kc::KeyedClass<
+ kc::Field<k::environment, Environment *>,
+ kc::Field<k::image, FSEntry>,
+ kc::Field<k::root, FSEntry>,
+ kc::Field<k::install_under, FSEntry>,
+ kc::Field<k::contents_file, FSEntry>,
+ kc::Field<k::config_protect, std::string>,
+ kc::Field<k::config_protect_mask, std::string>,
+ kc::Field<k::package_id, tr1::shared_ptr<const PackageID> >,
+ kc::Field<k::options, MergerOptions>
+ > NDBAMMergerParams;
/**
* Merger subclass for NDBAM.