aboutsummaryrefslogtreecommitdiff
path: root/paludis/ndbam_unmerger.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_unmerger.hh
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/ndbam_unmerger.hh')
-rw-r--r--paludis/ndbam_unmerger.hh22
1 files changed, 11 insertions, 11 deletions
diff --git a/paludis/ndbam_unmerger.hh b/paludis/ndbam_unmerger.hh
index e4b3dc26f..ee72fa6a6 100644
--- a/paludis/ndbam_unmerger.hh
+++ b/paludis/ndbam_unmerger.hh
@@ -27,7 +27,7 @@
#include <paludis/unmerger.hh>
#include <paludis/environment-fwd.hh>
#include <paludis/package_id-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -52,10 +52,10 @@ 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::ignore, const std::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;
+ 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;
};
@@ -79,9 +79,9 @@ namespace paludis
private:
Implementation<NDBAMUnmerger> * _imp;
- void _add_file(const std::tr1::shared_ptr<const ContentsEntry> &);
- void _add_dir(const std::tr1::shared_ptr<const ContentsEntry> &);
- void _add_sym(const std::tr1::shared_ptr<const ContentsEntry> &);
+ void _add_file(const std::shared_ptr<const ContentsEntry> &);
+ void _add_dir(const std::shared_ptr<const ContentsEntry> &);
+ void _add_sym(const std::shared_ptr<const ContentsEntry> &);
protected:
bool config_protected(const FSEntry &) const;
@@ -91,10 +91,10 @@ namespace paludis
void display(const std::string &) const;
- bool check_file(const std::tr1::shared_ptr<const ContentsEntry> &) const;
- bool check_dir(const std::tr1::shared_ptr<const ContentsEntry> &) const;
- bool check_sym(const std::tr1::shared_ptr<const ContentsEntry> &) const;
- bool check_misc(const std::tr1::shared_ptr<const ContentsEntry> &) const;
+ bool check_file(const std::shared_ptr<const ContentsEntry> &) const;
+ bool check_dir(const std::shared_ptr<const ContentsEntry> &) const;
+ bool check_sym(const std::shared_ptr<const ContentsEntry> &) const;
+ bool check_misc(const std::shared_ptr<const ContentsEntry> &) const;
public:
///\name Basic operations