aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_merger.hh
diff options
context:
space:
mode:
authorAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 10:11:47 +0100
committerAvatar Ciaran McCreesh <ciaran.mccreesh@googlemail.com> 2010-07-22 18:54:57 +0100
commit7a8a792ae878e2b432e0c67a813022117faa4e60 (patch)
treed9eac8e45ccc206bc6920d14e25f5613b54be02f /paludis/ndbam_merger.hh
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/ndbam_merger.hh')
-rw-r--r--paludis/ndbam_merger.hh10
1 files changed, 5 insertions, 5 deletions
diff --git a/paludis/ndbam_merger.hh b/paludis/ndbam_merger.hh
index 91ebe4a..21e3af6 100644
--- a/paludis/ndbam_merger.hh
+++ b/paludis/ndbam_merger.hh
@@ -24,7 +24,7 @@
#include <paludis/package_id-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/output_manager-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -52,13 +52,13 @@ namespace paludis
NamedValue<n::contents_file, FSEntry> contents_file;
NamedValue<n::environment, Environment *> environment;
NamedValue<n::fix_mtimes_before, Timestamp> fix_mtimes_before;
- NamedValue<n::get_new_ids_or_minus_one, std::tr1::function<std::pair<uid_t, gid_t> (const FSEntry &)> > get_new_ids_or_minus_one;
+ NamedValue<n::get_new_ids_or_minus_one, std::function<std::pair<uid_t, gid_t> (const FSEntry &)> > get_new_ids_or_minus_one;
NamedValue<n::image, FSEntry> image;
NamedValue<n::install_under, FSEntry> install_under;
- NamedValue<n::merged_entries, std::tr1::shared_ptr<FSEntrySet> > merged_entries;
+ NamedValue<n::merged_entries, std::shared_ptr<FSEntrySet> > merged_entries;
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::output_manager, std::shared_ptr<OutputManager> > output_manager;
+ NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::root, FSEntry> root;
};