aboutsummaryrefslogtreecommitdiff
path: root/src/clients/cave/executables_common.cc
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 /src/clients/cave/executables_common.cc
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'src/clients/cave/executables_common.cc')
-rw-r--r--src/clients/cave/executables_common.cc14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/clients/cave/executables_common.cc b/src/clients/cave/executables_common.cc
index fb665b2d5..f7f94771e 100644
--- a/src/clients/cave/executables_common.cc
+++ b/src/clients/cave/executables_common.cc
@@ -38,7 +38,7 @@
#include <algorithm>
#include <set>
#include <cstdlib>
-#include <tr1/memory>
+#include <memory>
using namespace paludis;
using namespace cave;
@@ -49,7 +49,7 @@ namespace
{
private:
const std::set<std::string> & _paths;
- const std::tr1::function<void (const FSEntry &)> _displayer;
+ const std::function<void (const FSEntry &)> _displayer;
bool is_executable_in_path(const FSEntry & file)
{
@@ -70,7 +70,7 @@ namespace
public:
ExecutablesDisplayer(
const std::set<std::string> & p,
- const std::tr1::function<void (const FSEntry &)> & d) :
+ const std::function<void (const FSEntry &)> & d) :
_paths(p),
_displayer(d)
{
@@ -103,11 +103,11 @@ namespace
int
paludis::cave::executables_common(
- const std::tr1::shared_ptr<Environment> & env,
+ const std::shared_ptr<Environment> & env,
const std::string & param,
- const std::tr1::function<void (const FSEntry &)> & displayer)
+ const std::function<void (const FSEntry &)> & displayer)
{
- std::tr1::shared_ptr<const PackageIDSequence> entries(
+ std::shared_ptr<const PackageIDSequence> entries(
(*env)[selection::AllVersionsSorted(generator::Matches(
PackageDepSpec(parse_user_package_dep_spec(
param, env.get(),
@@ -127,7 +127,7 @@ paludis::cave::executables_common(
{
if ((*t)->contents_key())
{
- std::tr1::shared_ptr<const Contents> contents((*t)->contents_key()->value());
+ std::shared_ptr<const Contents> contents((*t)->contents_key()->value());
std::for_each(indirect_iterator(contents->begin()), indirect_iterator(contents->end()), accept_visitor(ed));
}
}