aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-07 14:06:15 +0000
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2009-02-07 14:06:15 +0000
commitfc4695c629f9cf2b5727d32b451cbfa081f97836 (patch)
tree989fbcfa77b68a7dc9dcbe583e1bbc61b5753ddc /paludis/ndbam_merger.hh
parent7baffcaec4696b62b10ca39cd22d59cc87b20ad6 (diff)
downloadpaludis-fc4695c629f9cf2b5727d32b451cbfa081f97836.tar.gz
paludis-fc4695c629f9cf2b5727d32b451cbfa081f97836.tar.xz
Use output manager
Diffstat (limited to 'paludis/ndbam_merger.hh')
-rw-r--r--paludis/ndbam_merger.hh5
1 files changed, 4 insertions, 1 deletions
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 30baf69..8eb4e9b 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -1,7 +1,7 @@
/* vim: set sw=4 sts=4 et foldmethod=syntax : */
/*
- * Copyright (c) 2007, 2008 Ciaran McCreesh
+ * Copyright (c) 2007, 2008, 2009 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
@@ -23,6 +23,7 @@
#include <paludis/merger.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/util/named_value.hh>
+#include <paludis/util/output_manager-fwd.hh>
#include <tr1/functional>
namespace paludis
@@ -37,6 +38,7 @@ namespace paludis
struct image;
struct install_under;
struct options;
+ struct output_manager;
struct package_id;
struct root;
}
@@ -51,6 +53,7 @@ namespace paludis
NamedValue<n::image, FSEntry> image;
NamedValue<n::install_under, FSEntry> install_under;
NamedValue<n::options, MergerOptions> options;
+ NamedValue<n::output_manager, std::tr1::shared_ptr<OutputManager> > output_manager;
NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
NamedValue<n::root, FSEntry> root;
};