aboutsummaryrefslogtreecommitdiff
path: root/paludis/merger-fwd.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 21:30:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2011-09-02 21:30:47 +0100
commitd491d36b4c3fcb18818841a9ae08a8c99b48fc66 (patch)
tree1eb1fae3794b00c63d0be9964b4399c7834e5fee /paludis/merger-fwd.hh
parenta12fcfad377089b874926a30c6d5ec03e5635e70 (diff)
downloadpaludis-d491d36b4c3fcb18818841a9ae08a8c99b48fc66.tar.gz
paludis-d491d36b4c3fcb18818841a9ae08a8c99b48fc66.tar.xz
Move permit_destination into MergeParams
Diffstat (limited to 'paludis/merger-fwd.hh')
-rw-r--r--paludis/merger-fwd.hh15
1 files changed, 13 insertions, 2 deletions
diff --git a/paludis/merger-fwd.hh b/paludis/merger-fwd.hh
index 5897aa1b4..13e3548d3 100644
--- a/paludis/merger-fwd.hh
+++ b/paludis/merger-fwd.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2010 Ciaran McCreesh
+ * Copyright (c) 2010, 2011 Ciaran McCreesh
*
* This file is part of the Paludis package manager. Paludis is free software;
* you can redistribute it and/or modify it under the terms of the GNU General
@@ -20,9 +20,11 @@
#ifndef PALUDIS_GUARD_PALUDIS_MERGER_FWD_HH
#define PALUDIS_GUARD_PALUDIS_MERGER_FWD_HH 1
-#include <iosfwd>
#include <paludis/util/attributes.hh>
#include <paludis/util/options-fwd.hh>
+#include <paludis/util/fs_path-fwd.hh>
+#include <iosfwd>
+#include <functional>
namespace paludis
{
@@ -38,6 +40,15 @@ namespace paludis
typedef Options<MergerOption> MergerOptions;
class Merger;
+
+ /**
+ * Whether to allow merging to a particular destination.
+ *
+ * \ingroup g_repository
+ * \see MergerParams
+ * \since 0.66
+ */
+ typedef std::function<bool (const FSPath &)> PermitDestinationFn;
}
#endif