aboutsummaryrefslogtreecommitdiff
path: root/paludis/fs_merger-fwd.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/fs_merger-fwd.hh
parentd03893141379f242baf6ccbe0e934ebabd1ce626 (diff)
downloadpaludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.gz
paludis-ce13a6f9defe83fccd8424027ef1e24ca33b8cc2.tar.xz
Add Merger base class
Diffstat (limited to 'paludis/fs_merger-fwd.hh')
-rw-r--r--paludis/fs_merger-fwd.hh11
1 files changed, 0 insertions, 11 deletions
diff --git a/paludis/fs_merger-fwd.hh b/paludis/fs_merger-fwd.hh
index 2ccead7a4..804dde11e 100644
--- a/paludis/fs_merger-fwd.hh
+++ b/paludis/fs_merger-fwd.hh
@@ -24,8 +24,6 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/options-fwd.hh>
#include <paludis/util/fs_entry-fwd.hh>
-#include <paludis/environment-fwd.hh>
-#include <functional>
/** \file
* Forward declarations for paludis/fs_merger.hh .
@@ -39,15 +37,6 @@ namespace paludis
#include <paludis/fs_merger-se.hh>
/**
- * Boolean options for FSMerger.
- *
- * \ingroup g_repository
- * \since 0.26
- * \since 0.51 called FSMergerOptions instead of MergerOptions
- */
- typedef Options<FSMergerOption> FSMergerOptions;
-
- /**
* Status flags for Merger.
*
* \ingroup g_repository