aboutsummaryrefslogtreecommitdiff
path: root/paludis/repositories/e/fix_locked_dependencies.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/repositories/e/fix_locked_dependencies.cc
parent34700872057c99c57416612fbc264c48cfd38f9d (diff)
downloadpaludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.gz
paludis-7a8a792ae878e2b432e0c67a813022117faa4e60.tar.xz
No more tr1:: and tr1/
Diffstat (limited to 'paludis/repositories/e/fix_locked_dependencies.cc')
-rw-r--r--paludis/repositories/e/fix_locked_dependencies.cc30
1 files changed, 15 insertions, 15 deletions
diff --git a/paludis/repositories/e/fix_locked_dependencies.cc b/paludis/repositories/e/fix_locked_dependencies.cc
index 1a1f5ec62..21f6882b8 100644
--- a/paludis/repositories/e/fix_locked_dependencies.cc
+++ b/paludis/repositories/e/fix_locked_dependencies.cc
@@ -36,7 +36,7 @@
#include <paludis/filter.hh>
#include <paludis/filtered_generator.hh>
#include <paludis/metadata_key.hh>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <list>
@@ -45,23 +45,23 @@ using namespace paludis::erepository;
namespace
{
- void cannot_add(const std::tr1::shared_ptr<const DependencySpecTree> &) PALUDIS_ATTRIBUTE((noreturn));
+ void cannot_add(const std::shared_ptr<const DependencySpecTree> &) PALUDIS_ATTRIBUTE((noreturn));
- void cannot_add(const std::tr1::shared_ptr<const DependencySpecTree> &)
+ void cannot_add(const std::shared_ptr<const DependencySpecTree> &)
{
throw InternalError(PALUDIS_HERE, "Got weird tree");
}
struct Fixer
{
- std::list<std::tr1::shared_ptr<DependencySpecTree::BasicInnerNode> > stack;
- std::tr1::shared_ptr<DependencySpecTree> result;
+ std::list<std::shared_ptr<DependencySpecTree::BasicInnerNode> > stack;
+ std::shared_ptr<DependencySpecTree> result;
const Environment * const env;
const EAPI & eapi;
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
- Fixer(const Environment * const e, const EAPI & a, const std::tr1::shared_ptr<const PackageID> & i) :
+ Fixer(const Environment * const e, const EAPI & a, const std::shared_ptr<const PackageID> & i) :
result(new DependencySpecTree(make_shared_ptr(new AllDepSpec))),
env(e),
eapi(a),
@@ -72,7 +72,7 @@ namespace
void visit(const DependencySpecTree::NodeType<AllDepSpec>::Type & node)
{
- std::tr1::shared_ptr<AllDepSpec> spec(std::tr1::static_pointer_cast<AllDepSpec>(node.spec()->clone()));
+ std::shared_ptr<AllDepSpec> spec(std::static_pointer_cast<AllDepSpec>(node.spec()->clone()));
stack.push_front((*stack.begin())->append(spec));
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(*this));
stack.pop_front();
@@ -80,7 +80,7 @@ namespace
void visit(const DependencySpecTree::NodeType<AnyDepSpec>::Type & node)
{
- std::tr1::shared_ptr<AnyDepSpec> spec(std::tr1::static_pointer_cast<AnyDepSpec>(node.spec()->clone()));
+ std::shared_ptr<AnyDepSpec> spec(std::static_pointer_cast<AnyDepSpec>(node.spec()->clone()));
stack.push_front((*stack.begin())->append(spec));
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(*this));
stack.pop_front();
@@ -88,7 +88,7 @@ namespace
void visit(const DependencySpecTree::NodeType<ConditionalDepSpec>::Type & node)
{
- std::tr1::shared_ptr<ConditionalDepSpec> spec(std::tr1::static_pointer_cast<ConditionalDepSpec>(node.spec()->clone()));
+ std::shared_ptr<ConditionalDepSpec> spec(std::static_pointer_cast<ConditionalDepSpec>(node.spec()->clone()));
stack.push_front((*stack.begin())->append(spec));
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(*this));
stack.pop_front();
@@ -96,7 +96,7 @@ namespace
void visit(const DependencySpecTree::NodeType<PackageDepSpec>::Type & node)
{
- std::tr1::shared_ptr<const PackageDepSpec> c;
+ std::shared_ptr<const PackageDepSpec> c;
do
{
@@ -107,7 +107,7 @@ namespace
if (! r)
break;
- std::tr1::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
+ std::shared_ptr<const PackageIDSequence> matches((*env)[selection::AllVersionsSorted(
generator::Matches(*node.spec(), MatchPackageOptions()) | filter::InstalledAtRoot(FSEntry("/")))]);
if (matches->empty())
break;
@@ -143,11 +143,11 @@ namespace
};
}
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
paludis::erepository::fix_locked_dependencies(
const Environment * const env,
- const EAPI & e, const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const DependencySpecTree> & b)
+ const EAPI & e, const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const DependencySpecTree> & b)
{
Fixer f(env, e, id);
b->root()->accept(f);