aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_unmerger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-07 21:42:33 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-07-07 21:42:33 +0100
commit445b4e2cb40981ae78187c86e80a06886ed0ed3b (patch)
tree8ccaf6eaf231a96399a3ebef1ff4a0229e72692d /paludis/ndbam_unmerger.hh
parent4146c147935b26fa57a0734a13a26909a312ea47 (diff)
downloadpaludis-445b4e2cb40981ae78187c86e80a06886ed0ed3b.tar.gz
paludis-445b4e2cb40981ae78187c86e80a06886ed0ed3b.tar.xz
Framework for merge tracking
Not actually used yet.
Diffstat (limited to 'paludis/ndbam_unmerger.hh')
-rw-r--r--paludis/ndbam_unmerger.hh3
1 files changed, 3 insertions, 0 deletions
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index dc7014c47..474126f2b 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -27,6 +27,7 @@
#include <paludis/unmerger.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
+#include <tr1/functional>
namespace paludis
{
@@ -36,6 +37,7 @@ namespace paludis
struct config_protect_mask;
struct contents_file;
struct environment;
+ struct ignore;
struct ndbam;
struct output_manager;
struct package_id;
@@ -50,6 +52,7 @@ namespace paludis
NamedValue<n::config_protect_mask, std::string> config_protect_mask;
NamedValue<n::contents_file, FSEntry> contents_file;
NamedValue<n::environment, const Environment *> environment;
+ NamedValue<n::ignore, const std::tr1::function<bool (const FSEntry &)> > ignore;
NamedValue<n::ndbam, const NDBAM *> ndbam;
NamedValue<n::output_manager, std::tr1::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;