aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver/resolver_TEST_purges.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 /paludis/resolver/resolver_TEST_purges.cc
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/resolver/resolver_TEST_purges.cc')
-rw-r--r--paludis/resolver/resolver_TEST_purges.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/paludis/resolver/resolver_TEST_purges.cc b/paludis/resolver/resolver_TEST_purges.cc
index 03994e6ff..aa5228685 100644
--- a/paludis/resolver/resolver_TEST_purges.cc
+++ b/paludis/resolver/resolver_TEST_purges.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -64,9 +64,9 @@ namespace
UseExisting
use_existing_if_possible_except_target(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec & s,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const Reason> &)
{
if (s.package_ptr() && s.package_ptr()->package() == PackageNamePart("target"))
return ue_never;
@@ -96,14 +96,14 @@ namespace test_cases
virtual ResolverFunctions get_resolver_functions(InitialConstraints & initial_constraints)
{
ResolverFunctions result(ResolverPurgesTestCase::get_resolver_functions(initial_constraints));
- result.get_use_existing_fn() = std::tr1::bind(&use_existing_if_possible_except_target, std::tr1::placeholders::_1,
- std::tr1::placeholders::_2, std::tr1::placeholders::_3);
+ result.get_use_existing_fn() = std::bind(&use_existing_if_possible_except_target, std::placeholders::_1,
+ std::placeholders::_2, std::placeholders::_3);
return result;
}
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("purges/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("purges/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("purges/new-dep"))