aboutsummaryrefslogtreecommitdiff
path: root/paludis/resolver
diff options
context:
space:
mode:
Diffstat (limited to 'paludis/resolver')
-rw-r--r--paludis/resolver/change_by_resolvent.cc2
-rw-r--r--paludis/resolver/change_by_resolvent.hh2
-rw-r--r--paludis/resolver/constraint-fwd.hh4
-rw-r--r--paludis/resolver/constraint.cc40
-rw-r--r--paludis/resolver/constraint.hh14
-rw-r--r--paludis/resolver/decider.cc550
-rw-r--r--paludis/resolver/decider.hh238
-rw-r--r--paludis/resolver/decision.cc124
-rw-r--r--paludis/resolver/decision.hh58
-rw-r--r--paludis/resolver/decisions-fwd.hh4
-rw-r--r--paludis/resolver/decisions.cc42
-rw-r--r--paludis/resolver/decisions.hh26
-rw-r--r--paludis/resolver/destination.cc6
-rw-r--r--paludis/resolver/destination.hh6
-rw-r--r--paludis/resolver/job.cc94
-rw-r--r--paludis/resolver/job.hh50
-rw-r--r--paludis/resolver/job_list.cc18
-rw-r--r--paludis/resolver/job_list.hh12
-rw-r--r--paludis/resolver/job_lists.cc6
-rw-r--r--paludis/resolver/job_lists.hh8
-rw-r--r--paludis/resolver/job_state.cc38
-rw-r--r--paludis/resolver/job_state.hh30
-rw-r--r--paludis/resolver/nag.cc32
-rw-r--r--paludis/resolver/nag.hh10
-rw-r--r--paludis/resolver/orderer.cc97
-rw-r--r--paludis/resolver/orderer.hh18
-rw-r--r--paludis/resolver/orderer_notes.cc2
-rw-r--r--paludis/resolver/orderer_notes.hh4
-rw-r--r--paludis/resolver/package_or_block_dep_spec.cc8
-rw-r--r--paludis/resolver/package_or_block_dep_spec.hh6
-rw-r--r--paludis/resolver/reason.cc52
-rw-r--r--paludis/resolver/reason.hh24
-rw-r--r--paludis/resolver/required_confirmations-fwd.hh4
-rw-r--r--paludis/resolver/required_confirmations.cc16
-rw-r--r--paludis/resolver/required_confirmations.hh10
-rw-r--r--paludis/resolver/resolution.cc6
-rw-r--r--paludis/resolver/resolution.hh8
-rw-r--r--paludis/resolver/resolutions_by_resolvent.cc18
-rw-r--r--paludis/resolver/resolutions_by_resolvent.hh10
-rw-r--r--paludis/resolver/resolved.cc18
-rw-r--r--paludis/resolver/resolved.hh20
-rw-r--r--paludis/resolver/resolvent.cc2
-rw-r--r--paludis/resolver/resolvent.hh5
-rw-r--r--paludis/resolver/resolver.cc20
-rw-r--r--paludis/resolver/resolver.hh4
-rw-r--r--paludis/resolver/resolver_TEST_any.cc12
-rw-r--r--paludis/resolver/resolver_TEST_blockers.cc20
-rw-r--r--paludis/resolver/resolver_TEST_continue_on_failure.cc14
-rw-r--r--paludis/resolver/resolver_TEST_cycles.cc30
-rw-r--r--paludis/resolver/resolver_TEST_errors.cc4
-rw-r--r--paludis/resolver/resolver_TEST_fetches.cc4
-rw-r--r--paludis/resolver/resolver_TEST_purges.cc12
-rw-r--r--paludis/resolver/resolver_TEST_serialisation.cc6
-rw-r--r--paludis/resolver/resolver_TEST_simple.cc10
-rw-r--r--paludis/resolver/resolver_TEST_suggestions.cc8
-rw-r--r--paludis/resolver/resolver_TEST_uninstalls.cc6
-rw-r--r--paludis/resolver/resolver_TEST_virtuals.cc6
-rw-r--r--paludis/resolver/resolver_functions.hh90
-rw-r--r--paludis/resolver/resolver_test.cc178
-rw-r--r--paludis/resolver/resolver_test.hh136
-rw-r--r--paludis/resolver/sanitised_dependencies.cc56
-rw-r--r--paludis/resolver/sanitised_dependencies.hh14
-rw-r--r--paludis/resolver/slot_name_or_null.hh2
-rw-r--r--paludis/resolver/spec_rewriter.cc14
-rw-r--r--paludis/resolver/spec_rewriter.hh8
-rw-r--r--paludis/resolver/strongly_connected_component.hh6
-rw-r--r--paludis/resolver/suggest_restart.cc32
-rw-r--r--paludis/resolver/suggest_restart.hh16
-rw-r--r--paludis/resolver/unsuitable_candidates.cc4
-rw-r--r--paludis/resolver/unsuitable_candidates.hh4
70 files changed, 1228 insertions, 1230 deletions
diff --git a/paludis/resolver/change_by_resolvent.cc b/paludis/resolver/change_by_resolvent.cc
index 03e0a26ab..233a344f5 100644
--- a/paludis/resolver/change_by_resolvent.cc
+++ b/paludis/resolver/change_by_resolvent.cc
@@ -41,7 +41,7 @@ ChangeByResolvent::deserialise(Deserialisation & d)
{
Deserialisator v(d, "ChangeByResolvent");
return make_named_values<ChangeByResolvent>(
- n::package_id() = v.member<std::tr1::shared_ptr<const PackageID> >("package_id"),
+ n::package_id() = v.member<std::shared_ptr<const PackageID> >("package_id"),
n::resolvent() = v.member<Resolvent>("resolvent")
);
}
diff --git a/paludis/resolver/change_by_resolvent.hh b/paludis/resolver/change_by_resolvent.hh
index 7ff528cf6..6871ad59f 100644
--- a/paludis/resolver/change_by_resolvent.hh
+++ b/paludis/resolver/change_by_resolvent.hh
@@ -40,7 +40,7 @@ namespace paludis
{
struct ChangeByResolvent
{
- NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
+ NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
NamedValue<n::resolvent, Resolvent> resolvent;
void serialise(Serialiser &) const;
diff --git a/paludis/resolver/constraint-fwd.hh b/paludis/resolver/constraint-fwd.hh
index adbb06d9d..d9f225dff 100644
--- a/paludis/resolver/constraint-fwd.hh
+++ b/paludis/resolver/constraint-fwd.hh
@@ -22,7 +22,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/sequence-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -31,7 +31,7 @@ namespace paludis
struct Constraint;
struct Constraints;
- typedef Sequence<std::tr1::shared_ptr<const Constraint> > ConstraintSequence;
+ typedef Sequence<std::shared_ptr<const Constraint> > ConstraintSequence;
}
}
diff --git a/paludis/resolver/constraint.cc b/paludis/resolver/constraint.cc
index c18a54c29..a9b0d0312 100644
--- a/paludis/resolver/constraint.cc
+++ b/paludis/resolver/constraint.cc
@@ -42,7 +42,7 @@ namespace paludis
bool nothing_is_fine_too;
bool all_untaken;
- Sequence<std::tr1::shared_ptr<const Constraint> > constraints;
+ Sequence<std::shared_ptr<const Constraint> > constraints;
Implementation() :
strictest_use_existing(static_cast<UseExisting>(last_ue - 1)),
@@ -55,7 +55,7 @@ namespace paludis
template <>
struct WrappedForwardIteratorTraits<Constraints::ConstIteratorTag>
{
- typedef Sequence<std::tr1::shared_ptr<const Constraint> >::ConstIterator UnderlyingIterator;
+ typedef Sequence<std::shared_ptr<const Constraint> >::ConstIterator UnderlyingIterator;
};
}
@@ -99,7 +99,7 @@ Constraints::end() const
}
void
-Constraints::add(const std::tr1::shared_ptr<const Constraint> & c)
+Constraints::add(const std::shared_ptr<const Constraint> & c)
{
_imp->constraints.push_back(c);
_imp->strictest_use_existing = std::min(_imp->strictest_use_existing, c->use_existing());
@@ -121,14 +121,14 @@ Constraints::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<Constraints>
+const std::shared_ptr<Constraints>
Constraints::deserialise(Deserialisation & d)
{
Deserialisator v(d, "Constraints");
Deserialisator vv(*v.find_remove_member("items"), "c");
- std::tr1::shared_ptr<Constraints> result(new Constraints);
+ std::shared_ptr<Constraints> result(new Constraints);
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->add(vv.member<std::tr1::shared_ptr<Constraint> >(stringify(n)));
+ result->add(vv.member<std::shared_ptr<Constraint> >(stringify(n)));
return result;
}
@@ -149,56 +149,56 @@ namespace
{
struct IDFinder
{
- const std::tr1::shared_ptr<const PackageID> visit(const DependencyReason & r) const
+ const std::shared_ptr<const PackageID> visit(const DependencyReason & r) const
{
return r.from_id();
}
- const std::tr1::shared_ptr<const PackageID> visit(const SetReason &) const
+ const std::shared_ptr<const PackageID> visit(const SetReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const LikeOtherDestinationTypeReason &) const
+ const std::shared_ptr<const PackageID> visit(const LikeOtherDestinationTypeReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const PresetReason &) const
+ const std::shared_ptr<const PackageID> visit(const PresetReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const TargetReason &) const
+ const std::shared_ptr<const PackageID> visit(const TargetReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const DependentReason &) const
+ const std::shared_ptr<const PackageID> visit(const DependentReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const ViaBinaryReason &) const
+ const std::shared_ptr<const PackageID> visit(const ViaBinaryReason &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const WasUsedByReason &) const
+ const std::shared_ptr<const PackageID> visit(const WasUsedByReason &) const
{
return make_null_shared_ptr();
}
};
}
-const std::tr1::shared_ptr<Constraint>
+const std::shared_ptr<Constraint>
Constraint::deserialise(Deserialisation & d)
{
Context context("When deserialising:");
Deserialisator v(d, "Constraint");
- const std::tr1::shared_ptr<Reason> reason(v.member<std::tr1::shared_ptr<Reason> >("reason"));
+ const std::shared_ptr<Reason> reason(v.member<std::shared_ptr<Reason> >("reason"));
IDFinder id_finder;
return make_shared_ptr(new Constraint(make_named_values<Constraint>(
@@ -206,15 +206,15 @@ Constraint::deserialise(Deserialisation & d)
n::nothing_is_fine_too() = v.member<bool>("nothing_is_fine_too"),
n::reason() = reason,
n::spec() = PackageOrBlockDepSpec::deserialise(*v.find_remove_member("spec"),
- reason->accept_returning<std::tr1::shared_ptr<const PackageID> >(id_finder)),
+ reason->accept_returning<std::shared_ptr<const PackageID> >(id_finder)),
n::untaken() = v.member<bool>("untaken"),
n::use_existing() = destringify<UseExisting>(v.member<std::string>("use_existing"))
)));
}
template class PrivateImplementationPattern<Constraints>;
-template class WrappedForwardIterator<Constraints::ConstIteratorTag, const std::tr1::shared_ptr<const Constraint> >;
+template class WrappedForwardIterator<Constraints::ConstIteratorTag, const std::shared_ptr<const Constraint> >;
-template class Sequence<std::tr1::shared_ptr<const Constraint> >;
-template class WrappedForwardIterator<ConstraintSequence::ConstIteratorTag, const std::tr1::shared_ptr<const Constraint> >;
+template class Sequence<std::shared_ptr<const Constraint> >;
+template class WrappedForwardIterator<ConstraintSequence::ConstIteratorTag, const std::shared_ptr<const Constraint> >;
diff --git a/paludis/resolver/constraint.hh b/paludis/resolver/constraint.hh
index 6d8a7e97e..e979b5637 100644
--- a/paludis/resolver/constraint.hh
+++ b/paludis/resolver/constraint.hh
@@ -29,7 +29,7 @@
#include <paludis/util/options.hh>
#include <paludis/dep_spec.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -49,14 +49,14 @@ namespace paludis
{
NamedValue<n::destination_type, DestinationType> destination_type;
NamedValue<n::nothing_is_fine_too, bool> nothing_is_fine_too;
- NamedValue<n::reason, std::tr1::shared_ptr<const Reason> > reason;
+ NamedValue<n::reason, std::shared_ptr<const Reason> > reason;
NamedValue<n::spec, PackageOrBlockDepSpec> spec;
NamedValue<n::untaken, bool> untaken;
NamedValue<n::use_existing, UseExisting> use_existing;
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<Constraint> deserialise(
+ static const std::shared_ptr<Constraint> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -71,10 +71,10 @@ namespace paludis
bool all_untaken() const PALUDIS_ATTRIBUTE((warn_unused_result));
UseExisting strictest_use_existing() const PALUDIS_ATTRIBUTE((warn_unused_result));
- void add(const std::tr1::shared_ptr<const Constraint> &);
+ void add(const std::shared_ptr<const Constraint> &);
struct ConstIteratorTag;
- typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<const Constraint> > ConstIterator;
+ typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<const Constraint> > ConstIterator;
ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result));
ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -82,14 +82,14 @@ namespace paludis
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<Constraints> deserialise(
+ static const std::shared_ptr<Constraints> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
extern template class PrivateImplementationPattern<resolver::Constraints>;
extern template class WrappedForwardIterator<resolver::Constraints::ConstIteratorTag,
- const std::tr1::shared_ptr<const resolver::Constraint> >;
+ const std::shared_ptr<const resolver::Constraint> >;
}
#endif
diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc
index 5b365a76a..f9804a552 100644
--- a/paludis/resolver/decider.cc
+++ b/paludis/resolver/decider.cc
@@ -79,10 +79,10 @@ namespace paludis
const ResolverFunctions fns;
SpecRewriter rewriter;
- const std::tr1::shared_ptr<ResolutionsByResolvent> resolutions_by_resolvent;
+ const std::shared_ptr<ResolutionsByResolvent> resolutions_by_resolvent;
Implementation(const Environment * const e, const ResolverFunctions & f,
- const std::tr1::shared_ptr<ResolutionsByResolvent> & l) :
+ const std::shared_ptr<ResolutionsByResolvent> & l) :
env(e),
fns(f),
rewriter(env),
@@ -93,7 +93,7 @@ namespace paludis
}
Decider::Decider(const Environment * const e, const ResolverFunctions & f,
- const std::tr1::shared_ptr<ResolutionsByResolvent> & l) :
+ const std::shared_ptr<ResolutionsByResolvent> & l) :
PrivateImplementationPattern<Decider>(new Implementation<Decider>(e, f, l))
{
}
@@ -168,7 +168,7 @@ Decider::_resolve_vias()
Resolvent binary_resolvent((*i)->resolvent());
binary_resolvent.destination_type() = dt_create_binary;
- const std::tr1::shared_ptr<Resolution> binary_resolution(_resolution_for_resolvent(binary_resolvent, true));
+ const std::shared_ptr<Resolution> binary_resolution(_resolution_for_resolvent(binary_resolvent, true));
bool already(false);
for (Constraints::ConstIterator c(binary_resolution->constraints()->begin()),
@@ -185,7 +185,7 @@ Decider::_resolve_vias()
changed = true;
- const std::tr1::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_via_binary(binary_resolution, *i));
+ const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_via_binary(binary_resolution, *i));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
@@ -198,15 +198,15 @@ Decider::_resolve_vias()
}
bool
-Decider::_always_via_binary(const std::tr1::shared_ptr<const Resolution> & resolution) const
+Decider::_always_via_binary(const std::shared_ptr<const Resolution> & resolution) const
{
return _imp->fns.always_via_binary_fn()(resolution);
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_for_via_binary(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Resolution> & other_resolution) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & other_resolution) const
{
return _imp->fns.get_constraints_for_via_binary_fn()(resolution, other_resolution);
}
@@ -218,20 +218,20 @@ Decider::_resolve_dependents()
bool changed(false);
const std::pair<
- std::tr1::shared_ptr<const ChangeByResolventSequence>,
- std::tr1::shared_ptr<const ChangeByResolventSequence> > changing(_collect_changing());
+ std::shared_ptr<const ChangeByResolventSequence>,
+ std::shared_ptr<const ChangeByResolventSequence> > changing(_collect_changing());
if (changing.first->empty())
return false;
- const std::tr1::shared_ptr<const PackageIDSequence> staying(_collect_staying(changing.first));
+ const std::shared_ptr<const PackageIDSequence> staying(_collect_staying(changing.first));
for (PackageIDSequence::ConstIterator s(staying->begin()), s_end(staying->end()) ;
s != s_end ; ++s)
{
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
- const std::tr1::shared_ptr<const ChangeByResolventSequence> dependent_upon(_dependent_upon(
+ const std::shared_ptr<const ChangeByResolventSequence> dependent_upon(_dependent_upon(
*s, changing.first, changing.second));
if (dependent_upon->empty())
continue;
@@ -245,8 +245,8 @@ Decider::_resolve_dependents()
if (remove && _imp->resolutions_by_resolvent->end() == _imp->resolutions_by_resolvent->find(resolvent))
changed = true;
- const std::tr1::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
- const std::tr1::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_dependent(
+ const std::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
+ const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_dependent(
resolution, *s, dependent_upon));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
@@ -262,23 +262,23 @@ Decider::_resolve_dependents()
return changed;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_for_dependent(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & r) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & r) const
{
return _imp->fns.get_constraints_for_dependent_fn()(resolution, id, r);
}
namespace
{
- const std::tr1::shared_ptr<const PackageID> dependent_checker_id(const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const PackageID> dependent_checker_id(const std::shared_ptr<const PackageID> & i)
{
return i;
}
- const std::tr1::shared_ptr<const PackageID> dependent_checker_id(const ChangeByResolvent & i)
+ const std::shared_ptr<const PackageID> dependent_checker_id(const ChangeByResolvent & i)
{
return i.package_id();
}
@@ -287,14 +287,14 @@ namespace
struct DependentChecker
{
const Environment * const env;
- const std::tr1::shared_ptr<const C_> going_away;
- const std::tr1::shared_ptr<const C_> newly_available;
- const std::tr1::shared_ptr<C_> result;
+ const std::shared_ptr<const C_> going_away;
+ const std::shared_ptr<const C_> newly_available;
+ const std::shared_ptr<C_> result;
DependentChecker(
const Environment * const e,
- const std::tr1::shared_ptr<const C_> & g,
- const std::tr1::shared_ptr<const C_> & n) :
+ const std::shared_ptr<const C_> & g,
+ const std::shared_ptr<const C_> & n) :
env(e),
going_away(g),
newly_available(n),
@@ -304,7 +304,7 @@ namespace
void visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::Type & s)
{
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(s.spec()->name()));
+ const std::shared_ptr<const SetSpecTree> set(env->set(s.spec()->name()));
set->root()->accept(*this);
}
@@ -360,17 +360,17 @@ namespace
}
};
- const std::tr1::shared_ptr<const PackageID> get_change_by_resolvent_id(const ChangeByResolvent & r)
+ const std::shared_ptr<const PackageID> get_change_by_resolvent_id(const ChangeByResolvent & r)
{
return r.package_id();
}
}
-const std::tr1::shared_ptr<const ChangeByResolventSequence>
+const std::shared_ptr<const ChangeByResolventSequence>
Decider::_dependent_upon(
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & going_away,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & staying) const
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & going_away,
+ const std::shared_ptr<const ChangeByResolventSequence> & staying) const
{
DependentChecker<ChangeByResolventSequence> c(_imp->env, going_away, staying);
if (id->dependencies_key())
@@ -394,10 +394,10 @@ namespace
{
struct ChangingCollector
{
- std::tr1::shared_ptr<Resolution> current_resolution;
+ std::shared_ptr<Resolution> current_resolution;
- std::tr1::shared_ptr<ChangeByResolventSequence> going_away;
- std::tr1::shared_ptr<ChangeByResolventSequence> newly_available;
+ std::shared_ptr<ChangeByResolventSequence> going_away;
+ std::shared_ptr<ChangeByResolventSequence> newly_available;
ChangingCollector() :
going_away(new ChangeByResolventSequence),
@@ -449,8 +449,8 @@ namespace
}
const std::pair<
- std::tr1::shared_ptr<const ChangeByResolventSequence>,
- std::tr1::shared_ptr<const ChangeByResolventSequence> >
+ std::shared_ptr<const ChangeByResolventSequence>,
+ std::shared_ptr<const ChangeByResolventSequence> >
Decider::_collect_changing() const
{
ChangingCollector c;
@@ -471,9 +471,9 @@ namespace
{
struct ChangeByResolventPackageIDIs
{
- const std::tr1::shared_ptr<const PackageID> id;
+ const std::shared_ptr<const PackageID> id;
- ChangeByResolventPackageIDIs(const std::tr1::shared_ptr<const PackageID> & i) :
+ ChangeByResolventPackageIDIs(const std::shared_ptr<const PackageID> & i) :
id(i)
{
}
@@ -485,13 +485,13 @@ namespace
};
}
-const std::tr1::shared_ptr<const PackageIDSequence>
-Decider::_collect_staying(const std::tr1::shared_ptr<const ChangeByResolventSequence> & going_away) const
+const std::shared_ptr<const PackageIDSequence>
+Decider::_collect_staying(const std::shared_ptr<const ChangeByResolventSequence> & going_away) const
{
- const std::tr1::shared_ptr<const PackageIDSequence> existing((*_imp->env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> existing((*_imp->env)[selection::AllVersionsUnsorted(
generator::All() | filter::InstalledAtRoot(FSEntry("/")))]);
- const std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ const std::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
for (PackageIDSequence::ConstIterator x(existing->begin()), x_end(existing->end()) ;
x != x_end ; ++x)
if (going_away->end() == std::find_if(going_away->begin(), going_away->end(), ChangeByResolventPackageIDIs(*x)))
@@ -513,19 +513,19 @@ Decider::_resolve_confirmations()
void
Decider::_fixup_changes_to_make_decision(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
ChangesToMakeDecision & decision) const
{
decision.set_destination(_make_destination_for(resolution, decision));
decision.set_change_type(_make_change_type_for(resolution, decision));
}
-const std::tr1::shared_ptr<Destination>
+const std::shared_ptr<Destination>
Decider::_make_destination_for(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision & decision) const
{
- const std::tr1::shared_ptr<const Repository> repo(_find_repository_for(resolution, decision));
+ const std::shared_ptr<const Repository> repo(_find_repository_for(resolution, decision));
if ((! repo->destination_interface()) ||
(! repo->destination_interface()->is_suitable_destination_for(*decision.origin_id())))
throw InternalError(PALUDIS_HERE, stringify(repo->name()) + " is not a suitable destination for "
@@ -539,12 +539,12 @@ Decider::_make_destination_for(
const ChangeType
Decider::_make_change_type_for(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const ChangesToMakeDecision & decision) const
{
if (decision.destination()->replacing()->empty())
{
- const std::tr1::shared_ptr<const PackageIDSequence> others((*_imp->env)[selection::SomeArbitraryVersion(
+ const std::shared_ptr<const PackageIDSequence> others((*_imp->env)[selection::SomeArbitraryVersion(
generator::Package(decision.origin_id()->name()) &
generator::InRepository(decision.destination()->repository())
)]);
@@ -574,9 +574,9 @@ Decider::_make_change_type_for(
}
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
Decider::_find_repository_for(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision & decision) const
{
return _imp->fns.find_repository_for_fn()(resolution, decision);
@@ -584,22 +584,22 @@ Decider::_find_repository_for(
FilteredGenerator
Decider::_make_destination_filtered_generator(const Generator & g,
- const std::tr1::shared_ptr<const Resolution> & resolution) const
+ const std::shared_ptr<const Resolution> & resolution) const
{
return _imp->fns.make_destination_filtered_generator_fn()(g, resolution);
}
FilteredGenerator
Decider::_make_origin_filtered_generator(const Generator & g,
- const std::tr1::shared_ptr<const Resolution> & resolution) const
+ const std::shared_ptr<const Resolution> & resolution) const
{
return _imp->fns.make_origin_filtered_generator_fn()(g, resolution);
}
-const std::tr1::shared_ptr<const PackageIDSequence>
+const std::shared_ptr<const PackageIDSequence>
Decider::_find_replacing(
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const Repository> & repo) const
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const Repository> & repo) const
{
Context context("When working out what is replaced by '" + stringify(*id) +
"' when it is installed to '" + stringify(repo->name()) + "':");
@@ -618,12 +618,12 @@ Decider::_find_replacing(
else
repos.insert(repo->name());
- std::tr1::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> result(new PackageIDSequence);
for (std::set<RepositoryName>::const_iterator r(repos.begin()),
r_end(repos.end()) ;
r != r_end ; ++r)
{
- std::tr1::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::AllVersionsUnsorted(
+ std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::AllVersionsUnsorted(
generator::Package(id->name()) & generator::InRepository(*r))]);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
@@ -637,8 +637,8 @@ Decider::_find_replacing(
}
bool
-Decider::_same_slot(const std::tr1::shared_ptr<const PackageID> & a,
- const std::tr1::shared_ptr<const PackageID> & b) const
+Decider::_same_slot(const std::shared_ptr<const PackageID> & a,
+ const std::shared_ptr<const PackageID> & b) const
{
if (a->slot_key())
return b->slot_key() && a->slot_key()->value() == b->slot_key()->value();
@@ -646,7 +646,7 @@ Decider::_same_slot(const std::tr1::shared_ptr<const PackageID> & a,
return ! b->slot_key();
}
-const std::tr1::shared_ptr<Resolution>
+const std::shared_ptr<Resolution>
Decider::_create_resolution_for_resolvent(const Resolvent & r) const
{
return make_shared_ptr(new Resolution(make_named_values<Resolution>(
@@ -656,7 +656,7 @@ Decider::_create_resolution_for_resolvent(const Resolvent & r) const
)));
}
-const std::tr1::shared_ptr<Resolution>
+const std::shared_ptr<Resolution>
Decider::_resolution_for_resolvent(const Resolvent & r, const Tribool if_not_exist)
{
ResolutionsByResolvent::ConstIterator i(_imp->resolutions_by_resolvent->find(r));
@@ -664,7 +664,7 @@ Decider::_resolution_for_resolvent(const Resolvent & r, const Tribool if_not_exi
{
if (if_not_exist.is_true())
{
- std::tr1::shared_ptr<Resolution> resolution(_create_resolution_for_resolvent(r));
+ std::shared_ptr<Resolution> resolution(_create_resolution_for_resolvent(r));
i = _imp->resolutions_by_resolvent->insert_new(resolution);
}
else if (if_not_exist.is_false())
@@ -677,15 +677,15 @@ Decider::_resolution_for_resolvent(const Resolvent & r, const Tribool if_not_exi
return *i;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_from_target(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const PackageOrBlockDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const
+ const std::shared_ptr<const Reason> & reason) const
{
if (spec.if_package())
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = resolution->resolvent().destination_type(),
n::nothing_is_fine_too() = false,
@@ -702,16 +702,16 @@ Decider::_make_constraints_from_target(
throw InternalError(PALUDIS_HERE, "resolver bug: huh? it's not a block and it's not a package");
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_from_dependency(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const SanitisedDependency & dep,
- const std::tr1::shared_ptr<const Reason> & reason,
+ const std::shared_ptr<const Reason> & reason,
const SpecInterest interest) const
{
if (dep.spec().if_package())
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = resolution->resolvent().destination_type(),
n::nothing_is_fine_too() = false,
@@ -728,13 +728,13 @@ Decider::_make_constraints_from_dependency(
throw InternalError(PALUDIS_HERE, "resolver bug: huh? it's not a block and it's not a package");
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_from_blocker(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const BlockDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const
+ const std::shared_ptr<const Reason> & reason) const
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
DestinationTypes destination_types(_get_destination_types_for_blocker(spec));
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
@@ -753,8 +753,8 @@ Decider::_make_constraints_from_blocker(
void
Decider::_apply_resolution_constraint(
- const std::tr1::shared_ptr<Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint)
+ const std::shared_ptr<Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint)
{
if (resolution->decision())
if (! _verify_new_constraint(resolution, constraint))
@@ -776,7 +776,7 @@ namespace
{
}
- bool ok(const std::tr1::shared_ptr<const PackageID> & chosen_id) const
+ bool ok(const std::shared_ptr<const PackageID> & chosen_id) const
{
if (constraint.spec().if_package())
{
@@ -826,9 +826,9 @@ namespace
struct CheckUseExistingVisitor
{
- const std::tr1::shared_ptr<const Constraint> constraint;
+ const std::shared_ptr<const Constraint> constraint;
- CheckUseExistingVisitor(const std::tr1::shared_ptr<const Constraint> & c) :
+ CheckUseExistingVisitor(const std::shared_ptr<const Constraint> & c) :
constraint(c)
{
}
@@ -892,8 +892,8 @@ namespace
bool
Decider::_check_constraint(
- const std::tr1::shared_ptr<const Constraint> & constraint,
- const std::tr1::shared_ptr<const Decision> & decision) const
+ const std::shared_ptr<const Constraint> & constraint,
+ const std::shared_ptr<const Decision> & decision) const
{
if (! decision->accept_returning<bool>(CheckConstraintVisitor(_imp->env, *constraint)))
return false;
@@ -912,8 +912,8 @@ Decider::_check_constraint(
bool
Decider::_verify_new_constraint(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint)
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint)
{
return _check_constraint(constraint, resolution->decision());
}
@@ -922,9 +922,9 @@ namespace
{
struct WrongDecisionVisitor
{
- std::tr1::function<void ()> restart;
+ std::function<void ()> restart;
- WrongDecisionVisitor(const std::tr1::function<void ()> & r) :
+ WrongDecisionVisitor(const std::function<void ()> & r) :
restart(r)
{
}
@@ -963,17 +963,17 @@ namespace
void
Decider::_made_wrong_decision(
- const std::tr1::shared_ptr<Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint)
+ const std::shared_ptr<Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint)
{
/* can we find a resolution that works for all our constraints? */
- std::tr1::shared_ptr<Resolution> adapted_resolution(make_shared_ptr(new Resolution(*resolution)));
+ std::shared_ptr<Resolution> adapted_resolution(make_shared_ptr(new Resolution(*resolution)));
adapted_resolution->constraints()->add(constraint);
- const std::tr1::shared_ptr<Decision> decision(_try_to_find_decision_for(adapted_resolution));
+ const std::shared_ptr<Decision> decision(_try_to_find_decision_for(adapted_resolution));
if (decision)
{
- resolution->decision()->accept(WrongDecisionVisitor(std::tr1::bind(
+ resolution->decision()->accept(WrongDecisionVisitor(std::bind(
&Decider::_suggest_restart_with, this, resolution, constraint, decision)));
resolution->decision() = decision;
}
@@ -983,22 +983,22 @@ Decider::_made_wrong_decision(
void
Decider::_suggest_restart_with(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint,
- const std::tr1::shared_ptr<const Decision> & decision) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint,
+ const std::shared_ptr<const Decision> & decision) const
{
throw SuggestRestart(resolution->resolvent(), resolution->decision(), constraint, decision,
_make_constraint_for_preloading(decision, constraint));
}
-const std::tr1::shared_ptr<const Constraint>
+const std::shared_ptr<const Constraint>
Decider::_make_constraint_for_preloading(
- const std::tr1::shared_ptr<const Decision> &,
- const std::tr1::shared_ptr<const Constraint> & c) const
+ const std::shared_ptr<const Decision> &,
+ const std::shared_ptr<const Constraint> & c) const
{
- const std::tr1::shared_ptr<Constraint> result(new Constraint(*c));
+ const std::shared_ptr<Constraint> result(new Constraint(*c));
- const std::tr1::shared_ptr<PresetReason> reason(new PresetReason("restarted because of", c->reason()));
+ const std::shared_ptr<PresetReason> reason(new PresetReason("restarted because of", c->reason()));
result->reason() = reason;
if (result->spec().if_package())
@@ -1031,13 +1031,13 @@ Decider::_make_spec_for_preloading(const PackageDepSpec & spec) const
}
void
-Decider::_decide(const std::tr1::shared_ptr<Resolution> & resolution)
+Decider::_decide(const std::shared_ptr<Resolution> & resolution)
{
Context context("When deciding upon an origin ID to use for '" + stringify(resolution->resolvent()) + "':");
_copy_other_destination_constraints(resolution);
- std::tr1::shared_ptr<Decision> decision(_try_to_find_decision_for(resolution));
+ std::shared_ptr<Decision> decision(_try_to_find_decision_for(resolution));
if (decision)
resolution->decision() = decision;
else
@@ -1045,7 +1045,7 @@ Decider::_decide(const std::tr1::shared_ptr<Resolution> & resolution)
}
void
-Decider::_copy_other_destination_constraints(const std::tr1::shared_ptr<Resolution> & resolution)
+Decider::_copy_other_destination_constraints(const std::shared_ptr<Resolution> & resolution)
{
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
{
@@ -1055,7 +1055,7 @@ Decider::_copy_other_destination_constraints(const std::tr1::shared_ptr<Resoluti
Resolvent copy_from_resolvent(resolution->resolvent());
copy_from_resolvent.destination_type() = *t;
- const std::tr1::shared_ptr<Resolution> copy_from_resolution(
+ const std::shared_ptr<Resolution> copy_from_resolution(
_resolution_for_resolvent(copy_from_resolvent, indeterminate));
if (! copy_from_resolution)
continue;
@@ -1064,7 +1064,7 @@ Decider::_copy_other_destination_constraints(const std::tr1::shared_ptr<Resoluti
c_end(copy_from_resolution->constraints()->end()) ;
c != c_end ; ++c)
{
- const std::tr1::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_other_destination(
+ const std::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_other_destination(
resolution, copy_from_resolution, *c));
for (ConstraintSequence::ConstIterator d(constraints->begin()), d_end(constraints->end()) ;
d != d_end ; ++d)
@@ -1077,22 +1077,22 @@ namespace
{
struct DependenciesNecessityVisitor
{
- const std::tr1::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const NothingNoChangeDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const RemoveDecision &) const
+ const std::shared_ptr<const PackageID> visit(const RemoveDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
+ const std::shared_ptr<const PackageID> visit(const UnableToMakeDecision &) const
{
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & decision) const
+ const std::shared_ptr<const PackageID> visit(const ExistingNoChangeDecision & decision) const
{
if (decision.taken())
return decision.existing_id();
@@ -1100,7 +1100,7 @@ namespace
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & decision) const
+ const std::shared_ptr<const PackageID> visit(const ChangesToMakeDecision & decision) const
{
if (decision.taken())
return decision.origin_id();
@@ -1108,7 +1108,7 @@ namespace
return make_null_shared_ptr();
}
- const std::tr1::shared_ptr<const PackageID> visit(const BreakDecision &) const
+ const std::shared_ptr<const PackageID> visit(const BreakDecision &) const
{
return make_null_shared_ptr();
}
@@ -1117,10 +1117,10 @@ namespace
void
Decider::_add_dependencies_if_necessary(
- const std::tr1::shared_ptr<Resolution> & our_resolution)
+ const std::shared_ptr<Resolution> & our_resolution)
{
- const std::tr1::shared_ptr<const PackageID> package_id(
- our_resolution->decision()->accept_returning<std::tr1::shared_ptr<const PackageID> >(
+ const std::shared_ptr<const PackageID> package_id(
+ our_resolution->decision()->accept_returning<std::shared_ptr<const PackageID> >(
DependenciesNecessityVisitor()));
if (! package_id)
return;
@@ -1128,7 +1128,7 @@ Decider::_add_dependencies_if_necessary(
Context context("When adding dependencies for '" + stringify(our_resolution->resolvent()) + "' with '"
+ stringify(*package_id) + "':");
- const std::tr1::shared_ptr<SanitisedDependencies> deps(new SanitisedDependencies);
+ const std::shared_ptr<SanitisedDependencies> deps(new SanitisedDependencies);
deps->populate(_imp->env, *this, our_resolution, package_id);
for (SanitisedDependencies::ConstIterator s(deps->begin()), s_end(deps->end()) ;
@@ -1149,10 +1149,10 @@ Decider::_add_dependencies_if_necessary(
break;
}
- const std::tr1::shared_ptr<DependencyReason> reason(new DependencyReason(
+ const std::shared_ptr<DependencyReason> reason(new DependencyReason(
package_id, our_resolution->resolvent(), *s, _already_met(*s)));
- std::tr1::shared_ptr<const Resolvents> resolvents;
+ std::shared_ptr<const Resolvents> resolvents;
if (s->spec().if_package())
resolvents = _get_resolvents_for(*s->spec().if_package(), reason);
@@ -1172,8 +1172,8 @@ Decider::_add_dependencies_if_necessary(
for (Resolvents::ConstIterator r(resolvents->begin()), r_end(resolvents->end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<Resolution> dep_resolution(_resolution_for_resolvent(*r, true));
- const std::tr1::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_dependency(our_resolution, *s, reason, interest));
+ const std::shared_ptr<Resolution> dep_resolution(_resolution_for_resolvent(*r, true));
+ const std::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_dependency(our_resolution, *s, reason, interest));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
@@ -1183,12 +1183,12 @@ Decider::_add_dependencies_if_necessary(
}
SpecInterest
-Decider::_interest_in_spec(const std::tr1::shared_ptr<const Resolution> & resolution, const SanitisedDependency & dep) const
+Decider::_interest_in_spec(const std::shared_ptr<const Resolution> & resolution, const SanitisedDependency & dep) const
{
return _imp->fns.interest_in_spec_fn()(resolution, dep);
}
-const std::tr1::shared_ptr<Constraints>
+const std::shared_ptr<Constraints>
Decider::_initial_constraints_for(const Resolvent & r) const
{
return _imp->fns.get_initial_constraints_for_fn()(r);
@@ -1196,8 +1196,8 @@ Decider::_initial_constraints_for(const Resolvent & r) const
std::pair<AnyChildScore, OperatorScore>
Decider::find_any_score(
- const std::tr1::shared_ptr<const Resolution> & our_resolution,
- const std::tr1::shared_ptr<const PackageID> & our_id,
+ const std::shared_ptr<const Resolution> & our_resolution,
+ const std::shared_ptr<const PackageID> & our_id,
const SanitisedDependency & dep) const
{
Context context("When working out whether we'd like '" + stringify(dep.spec()) + "' because of '"
@@ -1283,7 +1283,7 @@ Decider::find_any_score(
/* best: blocker that doesn't match anything */
if (is_block)
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements)
| filter::SupportsAction<InstallAction>() | filter::NotMasked()
)]);
@@ -1293,7 +1293,7 @@ Decider::find_any_score(
/* next: already installed */
{
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions()) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty() ^ is_block)
@@ -1303,16 +1303,16 @@ Decider::find_any_score(
/* next: already installed, except with the wrong options */
if (! is_block && spec.additional_requirements_ptr())
{
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty())
return std::make_pair(acs_wrong_options_installed, operator_bias);
}
- const std::tr1::shared_ptr<DependencyReason> reason(new DependencyReason(
+ const std::shared_ptr<DependencyReason> reason(new DependencyReason(
our_id, our_resolution->resolvent(), dep, _already_met(dep)));
- const std::tr1::shared_ptr<const Resolvents> resolvents(_get_resolvents_for(spec, reason));
+ const std::shared_ptr<const Resolvents> resolvents(_get_resolvents_for(spec, reason));
/* next: will already be installing */
if (! is_block)
@@ -1332,13 +1332,13 @@ Decider::find_any_score(
for (Resolvents::ConstIterator r(resolvents->begin()), r_end(resolvents->end()) ;
r != r_end ; ++r)
{
- const std::tr1::shared_ptr<Resolution> resolution(_create_resolution_for_resolvent(*r));
- const std::tr1::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_dependency(
+ const std::shared_ptr<Resolution> resolution(_create_resolution_for_resolvent(*r));
+ const std::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_dependency(
our_resolution, dep, reason, si_take));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
resolution->constraints()->add(*c);
- const std::tr1::shared_ptr<Decision> decision(_try_to_find_decision_for(resolution));
+ const std::shared_ptr<Decision> decision(_try_to_find_decision_for(resolution));
if (decision)
return std::make_pair(acs_could_install, operator_bias);
}
@@ -1347,7 +1347,7 @@ Decider::find_any_score(
/* next: blocks installed package */
if (is_block)
{
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions()) |
filter::InstalledAtRoot(FSEntry("/")))]);
if (! installed_ids->empty())
@@ -1357,7 +1357,7 @@ Decider::find_any_score(
/* next: exists */
if (! is_block)
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
+ const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionOnly(
generator::Matches(spec, MatchPackageOptions() + mpo_ignore_additional_requirements)
)]);
if (! ids->empty())
@@ -1372,37 +1372,37 @@ namespace
{
struct SlotNameFinder
{
- std::tr1::shared_ptr<SlotName> visit(const SlotExactRequirement & s)
+ std::shared_ptr<SlotName> visit(const SlotExactRequirement & s)
{
return make_shared_ptr(new SlotName(s.slot()));
}
- std::tr1::shared_ptr<SlotName> visit(const SlotAnyUnlockedRequirement &)
+ std::shared_ptr<SlotName> visit(const SlotAnyUnlockedRequirement &)
{
return make_null_shared_ptr();
}
- std::tr1::shared_ptr<SlotName> visit(const SlotAnyLockedRequirement &)
+ std::shared_ptr<SlotName> visit(const SlotAnyLockedRequirement &)
{
return make_null_shared_ptr();
}
};
}
-const std::tr1::shared_ptr<const Resolvents>
+const std::shared_ptr<const Resolvents>
Decider::_get_resolvents_for_blocker(const BlockDepSpec & spec) const
{
Context context("When finding slots for '" + stringify(spec) + "':");
- std::tr1::shared_ptr<SlotName> exact_slot;
+ std::shared_ptr<SlotName> exact_slot;
if (spec.blocking().slot_requirement_ptr())
{
SlotNameFinder f;
- exact_slot = spec.blocking().slot_requirement_ptr()->accept_returning<std::tr1::shared_ptr<SlotName> >(f);
+ exact_slot = spec.blocking().slot_requirement_ptr()->accept_returning<std::shared_ptr<SlotName> >(f);
}
DestinationTypes destination_types(_get_destination_types_for_blocker(spec));
- std::tr1::shared_ptr<Resolvents> result(new Resolvents);
+ std::shared_ptr<Resolvents> result(new Resolvents);
if (exact_slot)
{
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
@@ -1411,7 +1411,7 @@ Decider::_get_resolvents_for_blocker(const BlockDepSpec & spec) const
}
else
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionInEachSlot(
+ const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::BestVersionInEachSlot(
generator::Package(*spec.blocking().package_ptr())
)]);
for (PackageIDSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
@@ -1430,19 +1430,19 @@ Decider::_get_destination_types_for_blocker(const BlockDepSpec &) const
return DestinationTypes() + dt_install_to_slash;
}
-const std::tr1::shared_ptr<const Resolvents>
+const std::shared_ptr<const Resolvents>
Decider::_get_resolvents_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const
+ const std::shared_ptr<const Reason> & reason) const
{
Context context("When finding slots for '" + stringify(spec) + "':");
- std::tr1::shared_ptr<SlotName> exact_slot;
+ std::shared_ptr<SlotName> exact_slot;
if (spec.slot_requirement_ptr())
{
SlotNameFinder f;
- exact_slot = spec.slot_requirement_ptr()->accept_returning<std::tr1::shared_ptr<SlotName> >(f);
+ exact_slot = spec.slot_requirement_ptr()->accept_returning<std::shared_ptr<SlotName> >(f);
}
return _imp->fns.get_resolvents_for_fn()(spec, exact_slot, reason);
@@ -1451,20 +1451,20 @@ Decider::_get_resolvents_for(
const DestinationTypes
Decider::_get_destination_types_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const Reason> & reason) const
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const Reason> & reason) const
{
return _imp->fns.get_destination_types_for_fn()(spec, id, reason);
}
-const std::tr1::shared_ptr<const Resolvents>
+const std::shared_ptr<const Resolvents>
Decider::_get_error_resolvents_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const
+ const std::shared_ptr<const Reason> & reason) const
{
Context context("When finding slots for '" + stringify(spec) + "', which can't be found the normal way:");
- std::tr1::shared_ptr<Resolvents> result(new Resolvents);
+ std::shared_ptr<Resolvents> result(new Resolvents);
DestinationTypes destination_types(_get_destination_types_for(spec, make_null_shared_ptr(), reason));
for (EnumIterator<DestinationType> t, t_end(last_dt) ; t != t_end ; ++t)
if (destination_types[*t])
@@ -1472,18 +1472,18 @@ Decider::_get_error_resolvents_for(
return result;
}
-const std::tr1::shared_ptr<Decision>
+const std::shared_ptr<Decision>
Decider::_try_to_find_decision_for(
- const std::tr1::shared_ptr<const Resolution> & resolution) const
+ const std::shared_ptr<const Resolution> & resolution) const
{
- const std::tr1::shared_ptr<const PackageID> existing_id(_find_existing_id_for(resolution));
- std::pair<const std::tr1::shared_ptr<const PackageID>, bool> installable_id_best(_find_installable_id_for(resolution));
- const std::tr1::shared_ptr<const PackageID> installable_id(installable_id_best.first);
+ const std::shared_ptr<const PackageID> existing_id(_find_existing_id_for(resolution));
+ std::pair<const std::shared_ptr<const PackageID>, bool> installable_id_best(_find_installable_id_for(resolution));
+ const std::shared_ptr<const PackageID> installable_id(installable_id_best.first);
bool best(installable_id_best.second);
if (resolution->constraints()->nothing_is_fine_too())
{
- const std::tr1::shared_ptr<const PackageIDSequence> existing_resolvent_ids(_installed_ids(resolution));
+ const std::shared_ptr<const PackageIDSequence> existing_resolvent_ids(_installed_ids(resolution));
if (existing_resolvent_ids->empty())
{
/* nothing existing, but nothing's ok */
@@ -1504,7 +1504,7 @@ Decider::_try_to_find_decision_for(
last_ct,
! resolution->constraints()->all_untaken(),
make_null_shared_ptr(),
- std::tr1::bind(&Decider::_fixup_changes_to_make_decision, this, resolution, std::tr1::placeholders::_1)
+ std::bind(&Decider::_fixup_changes_to_make_decision, this, resolution, std::placeholders::_1)
));
}
else if (existing_id && ! installable_id)
@@ -1614,7 +1614,7 @@ Decider::_try_to_find_decision_for(
existing_id->behaviours_key()->value()->find("transient"));
/* we've got existing and installable. do we have any reason not to pick the existing id? */
- const std::tr1::shared_ptr<Decision> existing(new ExistingNoChangeDecision(
+ const std::shared_ptr<Decision> existing(new ExistingNoChangeDecision(
resolution->resolvent(),
existing_id,
is_same,
@@ -1622,14 +1622,14 @@ Decider::_try_to_find_decision_for(
is_transient,
! resolution->constraints()->all_untaken()
));
- const std::tr1::shared_ptr<Decision> changes_to_make(new ChangesToMakeDecision(
+ const std::shared_ptr<Decision> changes_to_make(new ChangesToMakeDecision(
resolution->resolvent(),
installable_id,
best,
last_ct,
! resolution->constraints()->all_untaken(),
make_null_shared_ptr(),
- std::tr1::bind(&Decider::_fixup_changes_to_make_decision, this, resolution, std::tr1::placeholders::_1)
+ std::bind(&Decider::_fixup_changes_to_make_decision, this, resolution, std::placeholders::_1)
));
switch (resolution->constraints()->strictest_use_existing())
@@ -1661,17 +1661,17 @@ Decider::_try_to_find_decision_for(
throw InternalError(PALUDIS_HERE, "resolver bug: shouldn't be reached");
}
-const std::tr1::shared_ptr<Decision>
+const std::shared_ptr<Decision>
Decider::_cannot_decide_for(
- const std::tr1::shared_ptr<const Resolution> & resolution) const
+ const std::shared_ptr<const Resolution> & resolution) const
{
- const std::tr1::shared_ptr<UnsuitableCandidates> unsuitable_candidates(new UnsuitableCandidates);
+ const std::shared_ptr<UnsuitableCandidates> unsuitable_candidates(new UnsuitableCandidates);
- const std::tr1::shared_ptr<const PackageID> existing_id(_find_existing_id_for(resolution));
+ const std::shared_ptr<const PackageID> existing_id(_find_existing_id_for(resolution));
if (existing_id)
unsuitable_candidates->push_back(_make_unsuitable_candidate(resolution, existing_id, true));
- const std::tr1::shared_ptr<const PackageIDSequence> installable_ids(_find_installable_id_candidates_for(resolution, true));
+ const std::shared_ptr<const PackageIDSequence> installable_ids(_find_installable_id_candidates_for(resolution, true));
for (PackageIDSequence::ConstIterator i(installable_ids->begin()), i_end(installable_ids->end()) ;
i != i_end ; ++i)
unsuitable_candidates->push_back(_make_unsuitable_candidate(resolution, *i, false));
@@ -1685,8 +1685,8 @@ Decider::_cannot_decide_for(
UnsuitableCandidate
Decider::_make_unsuitable_candidate(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id,
const bool existing) const
{
return make_named_values<UnsuitableCandidate>(
@@ -1695,41 +1695,41 @@ Decider::_make_unsuitable_candidate(
);
}
-const std::tr1::shared_ptr<const PackageID>
-Decider::_find_existing_id_for(const std::tr1::shared_ptr<const Resolution> & resolution) const
+const std::shared_ptr<const PackageID>
+Decider::_find_existing_id_for(const std::shared_ptr<const Resolution> & resolution) const
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids(_installed_ids(resolution));
+ const std::shared_ptr<const PackageIDSequence> ids(_installed_ids(resolution));
return _find_id_for_from(resolution, ids).first;
}
bool
-Decider::_installed_but_allowed_to_remove(const std::tr1::shared_ptr<const Resolution> & resolution) const
+Decider::_installed_but_allowed_to_remove(const std::shared_ptr<const Resolution> & resolution) const
{
- const std::tr1::shared_ptr<const PackageIDSequence> ids(_installed_ids(resolution));
+ const std::shared_ptr<const PackageIDSequence> ids(_installed_ids(resolution));
if (ids->empty())
return false;
return ids->end() == std::find_if(ids->begin(), ids->end(),
- std::tr1::bind(std::logical_not<bool>(), std::tr1::bind(&Decider::_allowed_to_remove,
- this, resolution, std::tr1::placeholders::_1)));
+ std::bind(std::logical_not<bool>(), std::bind(&Decider::_allowed_to_remove,
+ this, resolution, std::placeholders::_1)));
}
bool
Decider::_allowed_to_remove(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id) const
{
return id->supports_action(SupportsActionTest<UninstallAction>()) && _imp->fns.allowed_to_remove_fn()(resolution, id);
}
bool
-Decider::_remove_if_dependent(const std::tr1::shared_ptr<const PackageID> & id) const
+Decider::_remove_if_dependent(const std::shared_ptr<const PackageID> & id) const
{
return _imp->fns.remove_if_dependent_fn()(id);
}
-const std::tr1::shared_ptr<const PackageIDSequence>
-Decider::_installed_ids(const std::tr1::shared_ptr<const Resolution> & resolution) const
+const std::shared_ptr<const PackageIDSequence>
+Decider::_installed_ids(const std::shared_ptr<const Resolution> & resolution) const
{
return (*_imp->env)[selection::AllVersionsSorted(
_make_destination_filtered_generator(generator::Package(resolution->resolvent().package()), resolution) |
@@ -1737,9 +1737,9 @@ Decider::_installed_ids(const std::tr1::shared_ptr<const Resolution> & resolutio
)];
}
-const std::tr1::shared_ptr<const PackageIDSequence>
+const std::shared_ptr<const PackageIDSequence>
Decider::_find_installable_id_candidates_for(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const bool include_errors) const
{
return (*_imp->env)[selection::AllVersionsSorted(
@@ -1750,18 +1750,18 @@ Decider::_find_installable_id_candidates_for(
)];
}
-const std::pair<const std::tr1::shared_ptr<const PackageID>, bool>
-Decider::_find_installable_id_for(const std::tr1::shared_ptr<const Resolution> & resolution) const
+const std::pair<const std::shared_ptr<const PackageID>, bool>
+Decider::_find_installable_id_for(const std::shared_ptr<const Resolution> & resolution) const
{
return _find_id_for_from(resolution, _find_installable_id_candidates_for(resolution, false));
}
-const std::pair<const std::tr1::shared_ptr<const PackageID>, bool>
+const std::pair<const std::shared_ptr<const PackageID>, bool>
Decider::_find_id_for_from(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageIDSequence> & ids) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageIDSequence> & ids) const
{
- std::tr1::shared_ptr<const PackageID> best_version;
+ std::shared_ptr<const PackageID> best_version;
for (PackageIDSequence::ReverseConstIterator i(ids->rbegin()), i_end(ids->rend()) ;
i != i_end ; ++i)
{
@@ -1789,19 +1789,19 @@ Decider::_find_id_for_from(
return std::make_pair(make_null_shared_ptr(), false);
}
-const std::tr1::shared_ptr<const Constraints>
+const std::shared_ptr<const Constraints>
Decider::_get_unmatching_constraints(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id,
const bool existing) const
{
- const std::tr1::shared_ptr<Constraints> result(new Constraints);
+ const std::shared_ptr<Constraints> result(new Constraints);
for (Constraints::ConstIterator c(resolution->constraints()->begin()),
c_end(resolution->constraints()->end()) ;
c != c_end ; ++c)
{
- std::tr1::shared_ptr<Decision> decision;
+ std::shared_ptr<Decision> decision;
if (existing)
{
@@ -1824,7 +1824,7 @@ Decider::_get_unmatching_constraints(
last_ct,
! (*c)->untaken(),
make_null_shared_ptr(),
- std::tr1::function<void (const ChangesToMakeDecision &)>()
+ std::function<void (const ChangesToMakeDecision &)>()
));
if (! _check_constraint(*c, decision))
result->add(*c);
@@ -1833,22 +1833,22 @@ Decider::_get_unmatching_constraints(
return result;
}
-const std::tr1::shared_ptr<const RewrittenSpec>
+const std::shared_ptr<const RewrittenSpec>
Decider::rewrite_if_special(
const PackageOrBlockDepSpec & spec,
- const std::tr1::shared_ptr<const Resolvent> & maybe_from) const
+ const std::shared_ptr<const Resolvent> & maybe_from) const
{
return _imp->rewriter.rewrite_if_special(spec, maybe_from);
}
void
-Decider::add_target_with_reason(const PackageOrBlockDepSpec & spec, const std::tr1::shared_ptr<const Reason> & reason)
+Decider::add_target_with_reason(const PackageOrBlockDepSpec & spec, const std::shared_ptr<const Reason> & reason)
{
Context context("When adding target '" + stringify(spec) + "':");
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
- const std::tr1::shared_ptr<const RewrittenSpec> if_rewritten(rewrite_if_special(spec, make_null_shared_ptr()));
+ const std::shared_ptr<const RewrittenSpec> if_rewritten(rewrite_if_special(spec, make_null_shared_ptr()));
if (if_rewritten)
{
for (Sequence<PackageOrBlockDepSpec>::ConstIterator i(if_rewritten->specs()->begin()), i_end(if_rewritten->specs()->end()) ;
@@ -1857,7 +1857,7 @@ Decider::add_target_with_reason(const PackageOrBlockDepSpec & spec, const std::t
}
else
{
- std::tr1::shared_ptr<const Resolvents> resolvents;
+ std::shared_ptr<const Resolvents> resolvents;
if (spec.if_package())
resolvents = _get_resolvents_for(*spec.if_package(), reason);
@@ -1880,8 +1880,8 @@ Decider::add_target_with_reason(const PackageOrBlockDepSpec & spec, const std::t
Context context_2("When adding constraints from target '" + stringify(spec) + "' to resolvent '"
+ stringify(*r) + "':");
- const std::tr1::shared_ptr<Resolution> dep_resolution(_resolution_for_resolvent(*r, true));
- const std::tr1::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_target(dep_resolution, spec, reason));
+ const std::shared_ptr<Resolution> dep_resolution(_resolution_for_resolvent(*r, true));
+ const std::shared_ptr<ConstraintSequence> constraints(_make_constraints_from_target(dep_resolution, spec, reason));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
@@ -1897,16 +1897,16 @@ Decider::purge()
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStageEvent("Collecting"));
- const std::tr1::shared_ptr<const PackageIDSet> have_now(_collect_installed());
- const std::tr1::shared_ptr<PackageIDSequence> have_now_seq(new PackageIDSequence);
+ const std::shared_ptr<const PackageIDSet> have_now(_collect_installed());
+ const std::shared_ptr<PackageIDSequence> have_now_seq(new PackageIDSequence);
std::copy(have_now->begin(), have_now->end(), have_now_seq->back_inserter());
- const std::tr1::shared_ptr<const PackageIDSet> world(_collect_world(have_now));
- const std::tr1::shared_ptr<const PackageIDSet> world_plus_deps(_accumulate_deps_and_provides(world, have_now_seq, true));
+ const std::shared_ptr<const PackageIDSet> world(_collect_world(have_now));
+ const std::shared_ptr<const PackageIDSet> world_plus_deps(_accumulate_deps_and_provides(world, have_now_seq, true));
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStageEvent("Calculating Unused"));
- const std::tr1::shared_ptr<PackageIDSet> unused(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> unused(new PackageIDSet);
std::set_difference(have_now->begin(), have_now->end(),
world_plus_deps->begin(), world_plus_deps->end(), unused->inserter(), PackageIDSetComparator());
@@ -1921,13 +1921,13 @@ Decider::purge()
continue;
Resolvent resolvent(*i, dt_install_to_slash);
- const std::tr1::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
+ const std::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
if (resolution->decision())
continue;
- const std::tr1::shared_ptr<const ChangeByResolventSequence> used_to_use(new ChangeByResolventSequence);
- const std::tr1::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use));
+ const std::shared_ptr<const ChangeByResolventSequence> used_to_use(new ChangeByResolventSequence);
+ const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
_apply_resolution_constraint(resolution, *c);
@@ -1936,12 +1936,12 @@ Decider::purge()
}
}
-const std::tr1::shared_ptr<const PackageIDSet>
+const std::shared_ptr<const PackageIDSet>
Decider::_collect_world(
- const std::tr1::shared_ptr<const PackageIDSet> & from) const
+ const std::shared_ptr<const PackageIDSet> & from) const
{
- const std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
- const std::tr1::shared_ptr<const SetSpecTree> set(_imp->env->set(SetName("world")));
+ const std::shared_ptr<PackageIDSet> result(new PackageIDSet);
+ const std::shared_ptr<const SetSpecTree> set(_imp->env->set(SetName("world")));
for (PackageIDSet::ConstIterator i(from->begin()), i_end(from->end()) ;
i != i_end ; ++i)
@@ -1981,7 +1981,7 @@ Decider::resolve()
bool
Decider::_already_met(const SanitisedDependency & dep) const
{
- const std::tr1::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> installed_ids((*_imp->env)[selection::AllVersionsUnsorted(
generator::Matches(dep.spec().if_package() ?
*dep.spec().if_package() :
dep.spec().if_block()->blocking(),
@@ -1995,7 +1995,7 @@ Decider::_already_met(const SanitisedDependency & dep) const
return false;
if (installed_ids->end() == std::find_if(installed_ids->begin(), installed_ids->end(),
- std::tr1::bind(&Decider::_can_use, this, std::tr1::placeholders::_1)))
+ std::bind(&Decider::_can_use, this, std::placeholders::_1)))
return false;
return true;
@@ -2004,7 +2004,7 @@ Decider::_already_met(const SanitisedDependency & dep) const
bool
Decider::_can_use(
- const std::tr1::shared_ptr<const PackageID> & id) const
+ const std::shared_ptr<const PackageID> & id) const
{
return _imp->fns.can_use_fn()(id);
}
@@ -2015,12 +2015,12 @@ namespace
{
const Environment * const env;
const ResolverFunctions & fns;
- const std::tr1::shared_ptr<const Resolution> resolution;
+ const std::shared_ptr<const Resolution> resolution;
ConfirmVisitor(
const Environment * const e,
const ResolverFunctions & f,
- const std::tr1::shared_ptr<const Resolution> & r) :
+ const std::shared_ptr<const Resolution> & r) :
env(e),
fns(f),
resolution(r)
@@ -2031,14 +2031,14 @@ namespace
{
if (! changes_to_make_decision.best())
{
- const std::tr1::shared_ptr<RequiredConfirmation> c(new NotBestConfirmation);
+ const std::shared_ptr<RequiredConfirmation> c(new NotBestConfirmation);
if (! fns.confirm_fn()(resolution, c))
changes_to_make_decision.add_required_confirmation(c);
}
if (ct_downgrade == changes_to_make_decision.change_type())
{
- const std::tr1::shared_ptr<DowngradeConfirmation> c(new DowngradeConfirmation);
+ const std::shared_ptr<DowngradeConfirmation> c(new DowngradeConfirmation);
if (! fns.confirm_fn()(resolution, c))
changes_to_make_decision.add_required_confirmation(c);
}
@@ -2046,7 +2046,7 @@ namespace
void visit(BreakDecision & break_decision) const
{
- const std::tr1::shared_ptr<BreakConfirmation> c(new BreakConfirmation);
+ const std::shared_ptr<BreakConfirmation> c(new BreakConfirmation);
if (! fns.confirm_fn()(resolution, c))
break_decision.add_required_confirmation(c);
}
@@ -2074,7 +2074,7 @@ namespace
if (is_system)
{
- const std::tr1::shared_ptr<RemoveSystemPackageConfirmation> c(new RemoveSystemPackageConfirmation);
+ const std::shared_ptr<RemoveSystemPackageConfirmation> c(new RemoveSystemPackageConfirmation);
if (! fns.confirm_fn()(resolution, c))
remove_decision.add_required_confirmation(c);
}
@@ -2084,7 +2084,7 @@ namespace
void
Decider::_confirm(
- const std::tr1::shared_ptr<const Resolution> & resolution)
+ const std::shared_ptr<const Resolution> & resolution)
{
resolution->decision()->accept(ConfirmVisitor(_imp->env, _imp->fns, resolution));
}
@@ -2095,62 +2095,62 @@ Decider::_resolve_purges()
Context context("When finding things to purge:");
const std::pair<
- std::tr1::shared_ptr<const ChangeByResolventSequence>,
- std::tr1::shared_ptr<const ChangeByResolventSequence> > going_away_newly_available(_collect_changing());
+ std::shared_ptr<const ChangeByResolventSequence>,
+ std::shared_ptr<const ChangeByResolventSequence> > going_away_newly_available(_collect_changing());
- const std::tr1::shared_ptr<PackageIDSet> going_away(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> going_away(new PackageIDSet);
std::transform(going_away_newly_available.first->begin(), going_away_newly_available.first->end(),
going_away->inserter(), get_change_by_resolvent_id);
- const std::tr1::shared_ptr<PackageIDSet> newly_available(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> newly_available(new PackageIDSet);
std::transform(going_away_newly_available.second->begin(), going_away_newly_available.second->end(),
newly_available->inserter(), get_change_by_resolvent_id);
- const std::tr1::shared_ptr<const PackageIDSet> have_now(_collect_installed());
+ const std::shared_ptr<const PackageIDSet> have_now(_collect_installed());
- const std::tr1::shared_ptr<PackageIDSet> have_now_minus_going_away(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> have_now_minus_going_away(new PackageIDSet);
std::set_difference(have_now->begin(), have_now->end(),
going_away->begin(), going_away->end(), have_now_minus_going_away->inserter(), PackageIDSetComparator());
- const std::tr1::shared_ptr<PackageIDSet> will_eventually_have_set(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> will_eventually_have_set(new PackageIDSet);
std::copy(have_now_minus_going_away->begin(), have_now_minus_going_away->end(), will_eventually_have_set->inserter());
std::copy(newly_available->begin(), newly_available->end(), will_eventually_have_set->inserter());
- const std::tr1::shared_ptr<PackageIDSequence> will_eventually_have(new PackageIDSequence);
+ const std::shared_ptr<PackageIDSequence> will_eventually_have(new PackageIDSequence);
std::copy(will_eventually_have_set->begin(), will_eventually_have_set->end(), will_eventually_have->back_inserter());
- const std::tr1::shared_ptr<const PackageIDSet> used_originally(_accumulate_deps_and_provides(going_away, will_eventually_have, false));
- const std::tr1::shared_ptr<const PackageIDSet> used_afterwards(_accumulate_deps_and_provides(newly_available, will_eventually_have, false));
+ const std::shared_ptr<const PackageIDSet> used_originally(_accumulate_deps_and_provides(going_away, will_eventually_have, false));
+ const std::shared_ptr<const PackageIDSet> used_afterwards(_accumulate_deps_and_provides(newly_available, will_eventually_have, false));
- const std::tr1::shared_ptr<PackageIDSet> used_originally_and_not_going_away(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> used_originally_and_not_going_away(new PackageIDSet);
std::set_difference(used_originally->begin(), used_originally->end(),
going_away->begin(), going_away->end(), used_originally_and_not_going_away->inserter(), PackageIDSetComparator());
- const std::tr1::shared_ptr<PackageIDSet> newly_unused(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> newly_unused(new PackageIDSet);
std::set_difference(used_originally_and_not_going_away->begin(), used_originally_and_not_going_away->end(),
used_afterwards->begin(), used_afterwards->end(), newly_unused->inserter(), PackageIDSetComparator());
if (newly_unused->empty())
return false;
- const std::tr1::shared_ptr<PackageIDSequence> newly_unused_seq(new PackageIDSequence);
+ const std::shared_ptr<PackageIDSequence> newly_unused_seq(new PackageIDSequence);
std::copy(newly_unused->begin(), newly_unused->end(), newly_unused_seq->back_inserter());
- const std::tr1::shared_ptr<PackageIDSet> used_by_unchanging(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> used_by_unchanging(new PackageIDSet);
for (PackageIDSet::ConstIterator u(have_now_minus_going_away->begin()), u_end(have_now_minus_going_away->end()) ;
u != u_end ; ++u)
{
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
- const std::tr1::shared_ptr<const PackageIDSet> used(_collect_depped_upon(*u, newly_unused_seq));
+ const std::shared_ptr<const PackageIDSet> used(_collect_depped_upon(*u, newly_unused_seq));
std::copy(used->begin(), used->end(), used_by_unchanging->inserter());
}
- const std::tr1::shared_ptr<PackageIDSet> newly_really_unused(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> newly_really_unused(new PackageIDSet);
std::set_difference(newly_unused->begin(), newly_unused->end(),
used_by_unchanging->begin(), used_by_unchanging->end(), newly_really_unused->inserter(), PackageIDSetComparator());
- const std::tr1::shared_ptr<const SetSpecTree> world(_imp->env->set(SetName("world")));
+ const std::shared_ptr<const SetSpecTree> world(_imp->env->set(SetName("world")));
bool changed(false);
for (PackageIDSet::ConstIterator i(newly_really_unused->begin()), i_end(newly_really_unused->end()) ;
@@ -2168,8 +2168,8 @@ Decider::_resolve_purges()
if (match_package_in_set(*_imp->env, *world, **i, MatchPackageOptions()))
continue;
- const std::tr1::shared_ptr<ChangeByResolventSequence> used_to_use(new ChangeByResolventSequence);
- const std::tr1::shared_ptr<PackageIDSequence> star_i_set(new PackageIDSequence);
+ const std::shared_ptr<ChangeByResolventSequence> used_to_use(new ChangeByResolventSequence);
+ const std::shared_ptr<PackageIDSequence> star_i_set(new PackageIDSequence);
star_i_set->push_back(*i);
for (ChangeByResolventSequence::ConstIterator g(going_away_newly_available.first->begin()), g_end(going_away_newly_available.first->end()) ;
g != g_end ; ++g)
@@ -2177,12 +2177,12 @@ Decider::_resolve_purges()
used_to_use->push_back(*g);
Resolvent resolvent(*i, dt_install_to_slash);
- const std::tr1::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
+ const std::shared_ptr<Resolution> resolution(_resolution_for_resolvent(resolvent, true));
if (resolution->decision())
continue;
- const std::tr1::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use));
+ const std::shared_ptr<const ConstraintSequence> constraints(_make_constraints_for_purge(resolution, *i, used_to_use));
for (ConstraintSequence::ConstIterator c(constraints->begin()), c_end(constraints->end()) ;
c != c_end ; ++c)
_apply_resolution_constraint(resolution, *c);
@@ -2196,29 +2196,29 @@ Decider::_resolve_purges()
return changed;
}
-const std::tr1::shared_ptr<const PackageIDSet>
+const std::shared_ptr<const PackageIDSet>
Decider::_collect_installed() const
{
- const std::tr1::shared_ptr<const PackageIDSequence> q((*_imp->env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> q((*_imp->env)[selection::AllVersionsUnsorted(
generator::All() | filter::InstalledAtRoot(FSEntry("/")))]);
- const std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> result(new PackageIDSet);
std::copy(q->begin(), q->end(), result->inserter());
return result;
}
-const std::tr1::shared_ptr<const PackageIDSet>
+const std::shared_ptr<const PackageIDSet>
Decider::_accumulate_deps_and_provides(
- const std::tr1::shared_ptr<const PackageIDSet> & start,
- const std::tr1::shared_ptr<const PackageIDSequence> & will_eventually_have,
+ const std::shared_ptr<const PackageIDSet> & start,
+ const std::shared_ptr<const PackageIDSequence> & will_eventually_have,
const bool recurse) const
{
- const std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet), done(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> result(new PackageIDSet), done(new PackageIDSet);
std::copy(start->begin(), start->end(), result->inserter());
while (result->size() > done->size())
{
- const std::tr1::shared_ptr<PackageIDSet> more(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> more(new PackageIDSet);
std::set_difference(result->begin(), result->end(), done->begin(), done->end(), more->inserter(), PackageIDSetComparator());
for (PackageIDSet::ConstIterator i(more->begin()), i_end(more->end()) ;
@@ -2228,10 +2228,10 @@ Decider::_accumulate_deps_and_provides(
done->insert(*i);
- const std::tr1::shared_ptr<const PackageIDSet> depped_upon(_collect_depped_upon(*i, will_eventually_have));
+ const std::shared_ptr<const PackageIDSet> depped_upon(_collect_depped_upon(*i, will_eventually_have));
std::copy(depped_upon->begin(), depped_upon->end(), result->inserter());
- const std::tr1::shared_ptr<const PackageIDSet> provided(_collect_provided(*i));
+ const std::shared_ptr<const PackageIDSet> provided(_collect_provided(*i));
std::copy(provided->begin(), provided->end(), result->inserter());
}
@@ -2242,10 +2242,10 @@ Decider::_accumulate_deps_and_provides(
return result;
}
-const std::tr1::shared_ptr<const PackageIDSet>
+const std::shared_ptr<const PackageIDSet>
Decider::_collect_depped_upon(
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const PackageIDSequence> & candidates) const
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageIDSequence> & candidates) const
{
DependentChecker<PackageIDSequence> c(_imp->env, candidates, make_shared_ptr(new PackageIDSequence));
if (id->dependencies_key())
@@ -2262,16 +2262,16 @@ Decider::_collect_depped_upon(
id->suggested_dependencies_key()->value()->root()->accept(c);
}
- const std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> result(new PackageIDSet);
std::copy(c.result->begin(), c.result->end(), result->inserter());
return result;
}
-const std::tr1::shared_ptr<const PackageIDSet>
+const std::shared_ptr<const PackageIDSet>
Decider::_collect_provided(
- const std::tr1::shared_ptr<const PackageID> & id) const
+ const std::shared_ptr<const PackageID> & id) const
{
- const std::tr1::shared_ptr<PackageIDSet> result(new PackageIDSet);
+ const std::shared_ptr<PackageIDSet> result(new PackageIDSet);
if (id->provide_key())
{
@@ -2281,7 +2281,7 @@ Decider::_collect_provided(
for (DepSpecFlattener<ProvideSpecTree, PackageDepSpec>::ConstIterator v(f.begin()), v_end(f.end()) ;
v != v_end ; ++v)
{
- const std::tr1::shared_ptr<const PackageIDSequence> virtuals((*_imp->env)[selection::AllVersionsUnsorted(
+ const std::shared_ptr<const PackageIDSequence> virtuals((*_imp->env)[selection::AllVersionsUnsorted(
generator::Matches(**v, MatchPackageOptions()))]);
std::copy(virtuals->begin(), virtuals->end(), result->inserter());
}
@@ -2290,11 +2290,11 @@ Decider::_collect_provided(
return result;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_for_purge(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & r) const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & r) const
{
return _imp->fns.get_constraints_for_purge_fn()(resolution, id, r);
}
@@ -2304,12 +2304,12 @@ namespace
struct ConstraintFromOtherDestinationVisitor
{
const DestinationType destination_type;
- const std::tr1::shared_ptr<const Constraint> from_constraint;
+ const std::shared_ptr<const Constraint> from_constraint;
const Resolvent resolvent;
ConstraintFromOtherDestinationVisitor(
const DestinationType t,
- const std::tr1::shared_ptr<const Constraint> f,
+ const std::shared_ptr<const Constraint> f,
const Resolvent & r) :
destination_type(t),
from_constraint(f),
@@ -2317,15 +2317,15 @@ namespace
{
}
- const std::tr1::shared_ptr<ConstraintSequence> visit(const LikeOtherDestinationTypeReason &) const
+ const std::shared_ptr<ConstraintSequence> visit(const LikeOtherDestinationTypeReason &) const
{
- std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
return result;
}
- const std::tr1::shared_ptr<ConstraintSequence> visit(const Reason &) const
+ const std::shared_ptr<ConstraintSequence> visit(const Reason &) const
{
- std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
result->push_back(make_shared_copy(make_named_values<Constraint>(
n::destination_type() = destination_type,
n::nothing_is_fine_too() = true,
@@ -2342,13 +2342,13 @@ namespace
};
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
Decider::_make_constraints_from_other_destination(
- const std::tr1::shared_ptr<const Resolution> & new_resolution,
- const std::tr1::shared_ptr<const Resolution> & from_resolution,
- const std::tr1::shared_ptr<const Constraint> & from_constraint) const
+ const std::shared_ptr<const Resolution> & new_resolution,
+ const std::shared_ptr<const Resolution> & from_resolution,
+ const std::shared_ptr<const Constraint> & from_constraint) const
{
- return from_constraint->reason()->accept_returning<std::tr1::shared_ptr<ConstraintSequence> >(
+ return from_constraint->reason()->accept_returning<std::shared_ptr<ConstraintSequence> >(
ConstraintFromOtherDestinationVisitor(new_resolution->resolvent().destination_type(),
from_constraint, from_resolution->resolvent()));
}
diff --git a/paludis/resolver/decider.hh b/paludis/resolver/decider.hh
index 782de33d3..6bd37cf22 100644
--- a/paludis/resolver/decider.hh
+++ b/paludis/resolver/decider.hh
@@ -55,94 +55,94 @@ namespace paludis
private PrivateImplementationPattern<Decider>
{
private:
- const std::tr1::shared_ptr<Resolution> _create_resolution_for_resolvent(const Resolvent &) const;
- const std::tr1::shared_ptr<Resolution> _resolution_for_resolvent(const Resolvent &, const Tribool);
+ const std::shared_ptr<Resolution> _create_resolution_for_resolvent(const Resolvent &) const;
+ const std::shared_ptr<Resolution> _resolution_for_resolvent(const Resolvent &, const Tribool);
- const std::tr1::shared_ptr<const Resolvents> _get_resolvents_for_blocker(const BlockDepSpec &) const;
+ const std::shared_ptr<const Resolvents> _get_resolvents_for_blocker(const BlockDepSpec &) const;
const DestinationTypes _get_destination_types_for_blocker(const BlockDepSpec &) const;
- const std::tr1::shared_ptr<const Resolvents> _get_resolvents_for(
+ const std::shared_ptr<const Resolvents> _get_resolvents_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const;
+ const std::shared_ptr<const Reason> & reason) const;
const DestinationTypes _get_destination_types_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const Reason> &) const;
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Reason> &) const;
- const std::tr1::shared_ptr<const Resolvents> _get_error_resolvents_for(
+ const std::shared_ptr<const Resolvents> _get_error_resolvents_for(
const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const Reason> & reason) const;
+ const std::shared_ptr<const Reason> & reason) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_from_target(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<ConstraintSequence> _make_constraints_from_target(
+ const std::shared_ptr<const Resolution> &,
const PackageOrBlockDepSpec &,
- const std::tr1::shared_ptr<const Reason> &) const;
+ const std::shared_ptr<const Reason> &) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_from_dependency(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<ConstraintSequence> _make_constraints_from_dependency(
+ const std::shared_ptr<const Resolution> &,
const SanitisedDependency &,
- const std::tr1::shared_ptr<const Reason> &,
+ const std::shared_ptr<const Reason> &,
const SpecInterest) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_from_blocker(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<ConstraintSequence> _make_constraints_from_blocker(
+ const std::shared_ptr<const Resolution> &,
const BlockDepSpec & dep,
- const std::tr1::shared_ptr<const Reason> & reason) const;
+ const std::shared_ptr<const Reason> & reason) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_for_dependent(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &) const;
+ const std::shared_ptr<ConstraintSequence> _make_constraints_for_dependent(
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_for_purge(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &) const;
+ const std::shared_ptr<ConstraintSequence> _make_constraints_for_purge(
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_from_other_destination(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Resolution> & from_resolution,
- const std::tr1::shared_ptr<const Constraint> & from_constraint) const;
+ const std::shared_ptr<ConstraintSequence> _make_constraints_from_other_destination(
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & from_resolution,
+ const std::shared_ptr<const Constraint> & from_constraint) const;
- const std::tr1::shared_ptr<ConstraintSequence> _make_constraints_for_via_binary(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Resolution> & from_resolution) const;
+ const std::shared_ptr<ConstraintSequence> _make_constraints_for_via_binary(
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & from_resolution) const;
void _apply_resolution_constraint(
- const std::tr1::shared_ptr<Resolution> &,
- const std::tr1::shared_ptr<const Constraint> &);
+ const std::shared_ptr<Resolution> &,
+ const std::shared_ptr<const Constraint> &);
bool _check_constraint(
- const std::tr1::shared_ptr<const Constraint> & constraint,
- const std::tr1::shared_ptr<const Decision> & decision) const;
+ const std::shared_ptr<const Constraint> & constraint,
+ const std::shared_ptr<const Decision> & decision) const;
bool _verify_new_constraint(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const Constraint> &);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Constraint> &);
void _made_wrong_decision(
- const std::tr1::shared_ptr<Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint);
+ const std::shared_ptr<Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint);
void _suggest_restart_with(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Constraint> & constraint,
- const std::tr1::shared_ptr<const Decision> & decision) const PALUDIS_ATTRIBUTE((noreturn));
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Constraint> & constraint,
+ const std::shared_ptr<const Decision> & decision) const PALUDIS_ATTRIBUTE((noreturn));
- const std::tr1::shared_ptr<const Constraint> _make_constraint_for_preloading(
- const std::tr1::shared_ptr<const Decision> & d,
- const std::tr1::shared_ptr<const Constraint> & c) const;
+ const std::shared_ptr<const Constraint> _make_constraint_for_preloading(
+ const std::shared_ptr<const Decision> & d,
+ const std::shared_ptr<const Constraint> & c) const;
const PackageDepSpec _make_spec_for_preloading(const PackageDepSpec & spec) const;
- const std::tr1::shared_ptr<const PackageIDSequence> _find_replacing(
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const Repository> &) const;
+ const std::shared_ptr<const PackageIDSequence> _find_replacing(
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Repository> &) const;
- const std::tr1::shared_ptr<const Repository> _find_repository_for(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Repository> _find_repository_for(
+ const std::shared_ptr<const Resolution> &,
const ChangesToMakeDecision &) const;
void _resolve_decide_with_dependencies();
@@ -152,138 +152,138 @@ namespace paludis
void _resolve_destinations();
void _resolve_confirmations();
- bool _via_binary(const std::tr1::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- bool _always_via_binary(const std::tr1::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool _via_binary(const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool _always_via_binary(const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
void _fixup_changes_to_make_decision(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
ChangesToMakeDecision &) const;
- const std::tr1::shared_ptr<Destination> _make_destination_for(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<Destination> _make_destination_for(
+ const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision &) const;
const ChangeType _make_change_type_for(
- const std::tr1::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & resolution,
const ChangesToMakeDecision &) const;
FilteredGenerator _make_destination_filtered_generator(
const Generator &,
- const std::tr1::shared_ptr<const Resolution> &) const;
+ const std::shared_ptr<const Resolution> &) const;
FilteredGenerator _make_origin_filtered_generator(
const Generator &,
- const std::tr1::shared_ptr<const Resolution> &) const;
+ const std::shared_ptr<const Resolution> &) const;
- void _decide(const std::tr1::shared_ptr<Resolution> & resolution);
- void _copy_other_destination_constraints(const std::tr1::shared_ptr<Resolution> & resolution);
+ void _decide(const std::shared_ptr<Resolution> & resolution);
+ void _copy_other_destination_constraints(const std::shared_ptr<Resolution> & resolution);
- const std::tr1::shared_ptr<Decision> _try_to_find_decision_for(
- const std::tr1::shared_ptr<const Resolution> & resolution) const;
+ const std::shared_ptr<Decision> _try_to_find_decision_for(
+ const std::shared_ptr<const Resolution> & resolution) const;
- const std::tr1::shared_ptr<Decision> _cannot_decide_for(
- const std::tr1::shared_ptr<const Resolution> & resolution) const;
+ const std::shared_ptr<Decision> _cannot_decide_for(
+ const std::shared_ptr<const Resolution> & resolution) const;
void _add_dependencies_if_necessary(
- const std::tr1::shared_ptr<Resolution> & our_resolution);
+ const std::shared_ptr<Resolution> & our_resolution);
SpecInterest _interest_in_spec(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const SanitisedDependency &) const;
- const std::tr1::shared_ptr<Constraints> _initial_constraints_for(const Resolvent &) const;
+ const std::shared_ptr<Constraints> _initial_constraints_for(const Resolvent &) const;
- bool _same_slot(const std::tr1::shared_ptr<const PackageID> & a,
- const std::tr1::shared_ptr<const PackageID> & b) const;
+ bool _same_slot(const std::shared_ptr<const PackageID> & a,
+ const std::shared_ptr<const PackageID> & b) const;
- const std::tr1::shared_ptr<const PackageID> _find_existing_id_for(
- const std::tr1::shared_ptr<const Resolution> &) const;
- const std::tr1::shared_ptr<const PackageIDSequence> _find_installable_id_candidates_for(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> _find_existing_id_for(
+ const std::shared_ptr<const Resolution> &) const;
+ const std::shared_ptr<const PackageIDSequence> _find_installable_id_candidates_for(
+ const std::shared_ptr<const Resolution> &,
const bool include_errors) const;
- const std::pair<const std::tr1::shared_ptr<const PackageID>, bool> _find_installable_id_for(
- const std::tr1::shared_ptr<const Resolution> &) const;
- const std::pair<const std::tr1::shared_ptr<const PackageID>, bool> _find_id_for_from(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageIDSequence> &) const;
-
- const std::tr1::shared_ptr<const Constraints> _get_unmatching_constraints(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::pair<const std::shared_ptr<const PackageID>, bool> _find_installable_id_for(
+ const std::shared_ptr<const Resolution> &) const;
+ const std::pair<const std::shared_ptr<const PackageID>, bool> _find_id_for_from(
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageIDSequence> &) const;
+
+ const std::shared_ptr<const Constraints> _get_unmatching_constraints(
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
const bool existing) const PALUDIS_ATTRIBUTE((warn_unused_result));
UnsuitableCandidate _make_unsuitable_candidate(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
const bool existing) const;
bool _already_met(const SanitisedDependency &) const PALUDIS_ATTRIBUTE((warn_unused_result));
bool _installed_but_allowed_to_remove(
- const std::tr1::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSequence> _installed_ids(
- const std::tr1::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSequence> _installed_ids(
+ const std::shared_ptr<const Resolution> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
bool _allowed_to_remove(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- bool _remove_if_dependent(const std::tr1::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ bool _remove_if_dependent(const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::pair<
- std::tr1::shared_ptr<const ChangeByResolventSequence>,
- std::tr1::shared_ptr<const ChangeByResolventSequence> > _collect_changing() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ std::shared_ptr<const ChangeByResolventSequence>,
+ std::shared_ptr<const ChangeByResolventSequence> > _collect_changing() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSequence> _collect_staying(
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSequence> _collect_staying(
+ const std::shared_ptr<const ChangeByResolventSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const ChangeByResolventSequence> _dependent_upon(
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const ChangeByResolventSequence> _dependent_upon(
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- void _confirm(const std::tr1::shared_ptr<const Resolution> & resolution);
+ void _confirm(const std::shared_ptr<const Resolution> & resolution);
- const std::tr1::shared_ptr<const PackageIDSet> _collect_installed() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSet> _collect_installed() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSet> _accumulate_deps_and_provides(
- const std::tr1::shared_ptr<const PackageIDSet> &,
- const std::tr1::shared_ptr<const PackageIDSequence> &,
+ const std::shared_ptr<const PackageIDSet> _accumulate_deps_and_provides(
+ const std::shared_ptr<const PackageIDSet> &,
+ const std::shared_ptr<const PackageIDSequence> &,
const bool recurse) const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSet> _collect_depped_upon(
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const PackageIDSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSet> _collect_depped_upon(
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageIDSequence> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSet> _collect_provided(
- const std::tr1::shared_ptr<const PackageID> & id) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSet> _collect_provided(
+ const std::shared_ptr<const PackageID> & id) const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSet> _collect_world(
- const std::tr1::shared_ptr<const PackageIDSet> & from) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageIDSet> _collect_world(
+ const std::shared_ptr<const PackageIDSet> & from) const PALUDIS_ATTRIBUTE((warn_unused_result));
bool _can_use(
- const std::tr1::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageID> &) const PALUDIS_ATTRIBUTE((warn_unused_result));
public:
Decider(const Environment * const,
const ResolverFunctions &,
- const std::tr1::shared_ptr<ResolutionsByResolvent> &);
+ const std::shared_ptr<ResolutionsByResolvent> &);
~Decider();
void resolve();
- void add_target_with_reason(const PackageOrBlockDepSpec &, const std::tr1::shared_ptr<const Reason> &);
+ void add_target_with_reason(const PackageOrBlockDepSpec &, const std::shared_ptr<const Reason> &);
void purge();
std::pair<AnyChildScore, OperatorScore> find_any_score(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
const SanitisedDependency &) const;
- const std::tr1::shared_ptr<const RewrittenSpec> rewrite_if_special(const PackageOrBlockDepSpec &,
- const std::tr1::shared_ptr<const Resolvent> & maybe_from) const;
+ const std::shared_ptr<const RewrittenSpec> rewrite_if_special(const PackageOrBlockDepSpec &,
+ const std::shared_ptr<const Resolvent> & maybe_from) const;
};
}
}
diff --git a/paludis/resolver/decision.cc b/paludis/resolver/decision.cc
index 0d0ed670c..0d91a0d2b 100644
--- a/paludis/resolver/decision.cc
+++ b/paludis/resolver/decision.cc
@@ -36,7 +36,7 @@ using namespace paludis::resolver;
Decision::~Decision() = default;
-const std::tr1::shared_ptr<Decision>
+const std::shared_ptr<Decision>
Decision::deserialise(Deserialisation & d)
{
if (d.class_name() == "NothingNoChangeDecision")
@@ -52,7 +52,7 @@ Decision::deserialise(Deserialisation & d)
Deserialisator v(d, "ExistingNoChangeDecision");
return make_shared_ptr(new ExistingNoChangeDecision(
v.member<Resolvent>("resolvent"),
- v.member<std::tr1::shared_ptr<const PackageID> >("existing_id"),
+ v.member<std::shared_ptr<const PackageID> >("existing_id"),
v.member<bool>("is_same"),
v.member<bool>("is_same_version"),
v.member<bool>("is_transient"),
@@ -79,7 +79,7 @@ Decision::deserialise(Deserialisation & d)
throw InternalError(PALUDIS_HERE, "unknown class '" + stringify(d.class_name()) + "'");
}
-const std::tr1::shared_ptr<ConfirmableDecision>
+const std::shared_ptr<ConfirmableDecision>
ConfirmableDecision::deserialise(Deserialisation & d)
{
if (d.class_name() == "ChangesToMakeDecision")
@@ -98,7 +98,7 @@ ConfirmableDecision::deserialise(Deserialisation & d)
throw InternalError(PALUDIS_HERE, "unknown class '" + stringify(d.class_name()) + "'");
}
-const std::tr1::shared_ptr<ChangeOrRemoveDecision>
+const std::shared_ptr<ChangeOrRemoveDecision>
ChangeOrRemoveDecision::deserialise(Deserialisation & d)
{
if (d.class_name() == "ChangesToMakeDecision")
@@ -113,32 +113,32 @@ ChangeOrRemoveDecision::deserialise(Deserialisation & d)
throw InternalError(PALUDIS_HERE, "unknown class '" + stringify(d.class_name()) + "'");
}
-const std::tr1::shared_ptr<ChangesToMakeDecision>
+const std::shared_ptr<ChangesToMakeDecision>
ChangesToMakeDecision::deserialise(Deserialisation & d)
{
Deserialisator v(d, "ChangesToMakeDecision");
- std::tr1::shared_ptr<ChangesToMakeDecision> result(new ChangesToMakeDecision(
+ std::shared_ptr<ChangesToMakeDecision> result(new ChangesToMakeDecision(
v.member<Resolvent>("resolvent"),
- v.member<std::tr1::shared_ptr<const PackageID> >("origin_id"),
+ v.member<std::shared_ptr<const PackageID> >("origin_id"),
v.member<bool>("best"),
destringify<ChangeType>(v.member<std::string>("change_type")),
v.member<bool>("taken"),
- v.member<std::tr1::shared_ptr<const Destination> >("destination"),
- std::tr1::function<void (const ChangesToMakeDecision &)>()
+ v.member<std::shared_ptr<const Destination> >("destination"),
+ std::function<void (const ChangesToMakeDecision &)>()
));
{
- const std::tr1::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
+ const std::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
if (! dn->null())
{
Deserialisator vv(*dn, "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->add_required_confirmation(vv.member<std::tr1::shared_ptr<RequiredConfirmation> >(stringify(n)));
+ result->add_required_confirmation(vv.member<std::shared_ptr<RequiredConfirmation> >(stringify(n)));
}
}
{
- const std::tr1::shared_ptr<Deserialisation> dn(v.find_remove_member("if_via_new_binary_in"));
+ const std::shared_ptr<Deserialisation> dn(v.find_remove_member("if_via_new_binary_in"));
if (! dn->null())
result->set_via_new_binary_in(RepositoryName(dn->string_value()));
}
@@ -146,12 +146,12 @@ ChangesToMakeDecision::deserialise(Deserialisation & d)
return result;
}
-const std::tr1::shared_ptr<UnableToMakeDecision>
+const std::shared_ptr<UnableToMakeDecision>
UnableToMakeDecision::deserialise(Deserialisation & d)
{
Deserialisator v(d, "UnableToMakeDecision");
- std::tr1::shared_ptr<UnsuitableCandidates> unsuitable_candidates(new UnsuitableCandidates);
+ std::shared_ptr<UnsuitableCandidates> unsuitable_candidates(new UnsuitableCandidates);
Deserialisator vv(*v.find_remove_member("unsuitable_candidates"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
unsuitable_candidates->push_back(vv.member<UnsuitableCandidate>(stringify(n)));
@@ -163,31 +163,31 @@ UnableToMakeDecision::deserialise(Deserialisation & d)
));
}
-const std::tr1::shared_ptr<RemoveDecision>
+const std::shared_ptr<RemoveDecision>
RemoveDecision::deserialise(Deserialisation & d)
{
Deserialisator v(d, "RemoveDecision");
- std::tr1::shared_ptr<PackageIDSequence> ids(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> ids(new PackageIDSequence);
{
Deserialisator vv(*v.find_remove_member("ids"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- ids->push_back(vv.member<std::tr1::shared_ptr<const PackageID> >(stringify(n)));
+ ids->push_back(vv.member<std::shared_ptr<const PackageID> >(stringify(n)));
}
- const std::tr1::shared_ptr<RemoveDecision> result(new RemoveDecision(
+ const std::shared_ptr<RemoveDecision> result(new RemoveDecision(
v.member<Resolvent>("resolvent"),
ids,
v.member<bool>("taken")
));
{
- const std::tr1::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
+ const std::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
if (! dn->null())
{
Deserialisator vv(*dn, "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->add_required_confirmation(vv.member<std::tr1::shared_ptr<RequiredConfirmation> >(stringify(n)));
+ result->add_required_confirmation(vv.member<std::shared_ptr<RequiredConfirmation> >(stringify(n)));
}
}
@@ -244,14 +244,14 @@ namespace paludis
struct Implementation<ExistingNoChangeDecision>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const PackageID> existing_id;
+ const std::shared_ptr<const PackageID> existing_id;
const bool is_same;
const bool is_same_version;
const bool is_transient;
const bool taken;
Implementation(const Resolvent & l,
- const std::tr1::shared_ptr<const PackageID> & e,
+ const std::shared_ptr<const PackageID> & e,
const bool s, const bool v, const bool r, const bool t) :
resolvent(l),
existing_id(e),
@@ -264,7 +264,7 @@ namespace paludis
};
}
-ExistingNoChangeDecision::ExistingNoChangeDecision(const Resolvent & l, const std::tr1::shared_ptr<const PackageID> & e,
+ExistingNoChangeDecision::ExistingNoChangeDecision(const Resolvent & l, const std::shared_ptr<const PackageID> & e,
const bool s, const bool v, const bool r, const bool t) :
PrivateImplementationPattern<ExistingNoChangeDecision>(new Implementation<ExistingNoChangeDecision>(
l, e, s, v, r, t))
@@ -273,7 +273,7 @@ ExistingNoChangeDecision::ExistingNoChangeDecision(const Resolvent & l, const st
ExistingNoChangeDecision::~ExistingNoChangeDecision() = default;
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
ExistingNoChangeDecision::existing_id() const
{
return _imp->existing_id;
@@ -328,21 +328,21 @@ namespace paludis
struct Implementation<ChangesToMakeDecision>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const PackageID> origin_id;
+ const std::shared_ptr<const PackageID> origin_id;
const bool best;
ChangeType change_type;
const bool taken;
- std::tr1::shared_ptr<const Destination> destination;
- std::tr1::shared_ptr<RequiredConfirmations> required_confirmations;
- std::tr1::shared_ptr<RepositoryName> if_via_new_binary_in;
+ std::shared_ptr<const Destination> destination;
+ std::shared_ptr<RequiredConfirmations> required_confirmations;
+ std::shared_ptr<RepositoryName> if_via_new_binary_in;
Implementation(
const Resolvent & l,
- const std::tr1::shared_ptr<const PackageID> & o,
+ const std::shared_ptr<const PackageID> & o,
const bool b,
const ChangeType c,
const bool t,
- const std::tr1::shared_ptr<const Destination> & d) :
+ const std::shared_ptr<const Destination> & d) :
resolvent(l),
origin_id(o),
best(b),
@@ -356,12 +356,12 @@ namespace paludis
ChangesToMakeDecision::ChangesToMakeDecision(
const Resolvent & r,
- const std::tr1::shared_ptr<const PackageID> & o,
+ const std::shared_ptr<const PackageID> & o,
const bool b,
const ChangeType c,
const bool t,
- const std::tr1::shared_ptr<const Destination> & d,
- const std::tr1::function<void (ChangesToMakeDecision &)> & f) :
+ const std::shared_ptr<const Destination> & d,
+ const std::function<void (ChangesToMakeDecision &)> & f) :
PrivateImplementationPattern<ChangesToMakeDecision>(new Implementation<ChangesToMakeDecision>(r, o, b, c, t, d))
{
if (f)
@@ -370,33 +370,33 @@ ChangesToMakeDecision::ChangesToMakeDecision(
ChangesToMakeDecision::~ChangesToMakeDecision() = default;
-const std::tr1::shared_ptr<const Destination>
+const std::shared_ptr<const Destination>
ChangesToMakeDecision::destination() const
{
return _imp->destination;
}
void
-ChangesToMakeDecision::set_destination(const std::tr1::shared_ptr<const Destination> & d)
+ChangesToMakeDecision::set_destination(const std::shared_ptr<const Destination> & d)
{
_imp->destination = d;
}
-const std::tr1::shared_ptr<const RequiredConfirmations>
+const std::shared_ptr<const RequiredConfirmations>
ChangesToMakeDecision::required_confirmations_if_any() const
{
return _imp->required_confirmations;
}
void
-ChangesToMakeDecision::add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> & r)
+ChangesToMakeDecision::add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> & r)
{
if (! _imp->required_confirmations)
_imp->required_confirmations.reset(new RequiredConfirmations);
_imp->required_confirmations->push_back(r);
}
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
ChangesToMakeDecision::origin_id() const
{
return _imp->origin_id;
@@ -432,7 +432,7 @@ ChangesToMakeDecision::taken() const
return _imp->taken;
}
-const std::tr1::shared_ptr<const RepositoryName>
+const std::shared_ptr<const RepositoryName>
ChangesToMakeDecision::if_via_new_binary_in() const
{
return _imp->if_via_new_binary_in;
@@ -466,11 +466,11 @@ namespace paludis
struct Implementation<UnableToMakeDecision>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const UnsuitableCandidates> unsuitable_candidates;
+ const std::shared_ptr<const UnsuitableCandidates> unsuitable_candidates;
const bool taken;
Implementation(const Resolvent & l,
- const std::tr1::shared_ptr<const UnsuitableCandidates> & u, const bool t) :
+ const std::shared_ptr<const UnsuitableCandidates> & u, const bool t) :
resolvent(l),
unsuitable_candidates(u),
taken(t)
@@ -481,7 +481,7 @@ namespace paludis
UnableToMakeDecision::UnableToMakeDecision(
const Resolvent & l,
- const std::tr1::shared_ptr<const UnsuitableCandidates> & u,
+ const std::shared_ptr<const UnsuitableCandidates> & u,
const bool t) :
PrivateImplementationPattern<UnableToMakeDecision>(new Implementation<UnableToMakeDecision>(l, u, t))
{
@@ -489,7 +489,7 @@ UnableToMakeDecision::UnableToMakeDecision(
UnableToMakeDecision::~UnableToMakeDecision() = default;
-const std::tr1::shared_ptr<const UnsuitableCandidates>
+const std::shared_ptr<const UnsuitableCandidates>
UnableToMakeDecision::unsuitable_candidates() const
{
return _imp->unsuitable_candidates;
@@ -523,11 +523,11 @@ namespace paludis
struct Implementation<RemoveDecision>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const PackageIDSequence> ids;
+ const std::shared_ptr<const PackageIDSequence> ids;
const bool taken;
- std::tr1::shared_ptr<RequiredConfirmations> required_confirmations;
+ std::shared_ptr<RequiredConfirmations> required_confirmations;
- Implementation(const Resolvent & l, const std::tr1::shared_ptr<const PackageIDSequence> & i, const bool t) :
+ Implementation(const Resolvent & l, const std::shared_ptr<const PackageIDSequence> & i, const bool t) :
resolvent(l),
ids(i),
taken(t)
@@ -536,7 +536,7 @@ namespace paludis
};
}
-RemoveDecision::RemoveDecision(const Resolvent & l, const std::tr1::shared_ptr<const PackageIDSequence> & i, const bool t) :
+RemoveDecision::RemoveDecision(const Resolvent & l, const std::shared_ptr<const PackageIDSequence> & i, const bool t) :
PrivateImplementationPattern<RemoveDecision>(new Implementation<RemoveDecision>(l, i, t))
{
}
@@ -555,20 +555,20 @@ RemoveDecision::taken() const
return _imp->taken;
}
-const std::tr1::shared_ptr<const PackageIDSequence>
+const std::shared_ptr<const PackageIDSequence>
RemoveDecision::ids() const
{
return _imp->ids;
}
-const std::tr1::shared_ptr<const RequiredConfirmations>
+const std::shared_ptr<const RequiredConfirmations>
RemoveDecision::required_confirmations_if_any() const
{
return _imp->required_confirmations;
}
void
-RemoveDecision::add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> & r)
+RemoveDecision::add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> & r)
{
if (! _imp->required_confirmations)
_imp->required_confirmations.reset(new RequiredConfirmations);
@@ -592,12 +592,12 @@ namespace paludis
struct Implementation<BreakDecision>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const PackageID> existing_id;
+ const std::shared_ptr<const PackageID> existing_id;
const bool taken;
- std::tr1::shared_ptr<RequiredConfirmations> required_confirmations;
+ std::shared_ptr<RequiredConfirmations> required_confirmations;
Implementation(const Resolvent & l,
- const std::tr1::shared_ptr<const PackageID> & e,
+ const std::shared_ptr<const PackageID> & e,
const bool t) :
resolvent(l),
existing_id(e),
@@ -607,7 +607,7 @@ namespace paludis
};
}
-BreakDecision::BreakDecision(const Resolvent & l, const std::tr1::shared_ptr<const PackageID> & e, const bool t) :
+BreakDecision::BreakDecision(const Resolvent & l, const std::shared_ptr<const PackageID> & e, const bool t) :
PrivateImplementationPattern<BreakDecision>(new Implementation<BreakDecision>(
l, e, t))
{
@@ -615,7 +615,7 @@ BreakDecision::BreakDecision(const Resolvent & l, const std::tr1::shared_ptr<con
BreakDecision::~BreakDecision() = default;
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
BreakDecision::existing_id() const
{
return _imp->existing_id;
@@ -633,14 +633,14 @@ BreakDecision::taken() const
return _imp->taken;
}
-const std::tr1::shared_ptr<const RequiredConfirmations>
+const std::shared_ptr<const RequiredConfirmations>
BreakDecision::required_confirmations_if_any() const
{
return _imp->required_confirmations;
}
void
-BreakDecision::add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> & r)
+BreakDecision::add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> & r)
{
if (! _imp->required_confirmations)
_imp->required_confirmations.reset(new RequiredConfirmations);
@@ -657,23 +657,23 @@ BreakDecision::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<BreakDecision>
+const std::shared_ptr<BreakDecision>
BreakDecision::deserialise(Deserialisation & d)
{
Deserialisator v(d, "BreakDecision");
- std::tr1::shared_ptr<BreakDecision> result(new BreakDecision(
+ std::shared_ptr<BreakDecision> result(new BreakDecision(
v.member<Resolvent>("resolvent"),
- v.member<std::tr1::shared_ptr<const PackageID> >("existing_id"),
+ v.member<std::shared_ptr<const PackageID> >("existing_id"),
v.member<bool>("taken")
));
{
- const std::tr1::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
+ const std::shared_ptr<Deserialisation> dn(v.find_remove_member("required_confirmations_if_any"));
if (! dn->null())
{
Deserialisator vv(*dn, "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->add_required_confirmation(vv.member<std::tr1::shared_ptr<RequiredConfirmation> >(stringify(n)));
+ result->add_required_confirmation(vv.member<std::shared_ptr<RequiredConfirmation> >(stringify(n)));
}
}
diff --git a/paludis/resolver/decision.hh b/paludis/resolver/decision.hh
index dbff3317c..54b2d3bc2 100644
--- a/paludis/resolver/decision.hh
+++ b/paludis/resolver/decision.hh
@@ -50,7 +50,7 @@ namespace paludis
virtual void serialise(Serialiser &) const = 0;
- static const std::tr1::shared_ptr<Decision> deserialise(
+ static const std::shared_ptr<Decision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -77,7 +77,7 @@ namespace paludis
public:
ExistingNoChangeDecision(
const Resolvent &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const bool is_same,
const bool is_same_version,
const bool is_transient,
@@ -85,7 +85,7 @@ namespace paludis
);
~ExistingNoChangeDecision();
- const std::tr1::shared_ptr<const PackageID> existing_id() const
+ const std::shared_ptr<const PackageID> existing_id() const
PALUDIS_ATTRIBUTE((warn_unused_result));
bool is_same() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -113,10 +113,10 @@ namespace paludis
using MoreSpecificVisitor::accept_returning;
using MoreSpecificVisitor::accept;
- static const std::tr1::shared_ptr<ConfirmableDecision> deserialise(
+ static const std::shared_ptr<ConfirmableDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const RequiredConfirmations>
+ virtual const std::shared_ptr<const RequiredConfirmations>
required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
};
@@ -135,7 +135,7 @@ namespace paludis
using MoreSpecificVisitor::accept_returning;
using MoreSpecificVisitor::accept;
- static const std::tr1::shared_ptr<ChangeOrRemoveDecision> deserialise(
+ static const std::shared_ptr<ChangeOrRemoveDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -149,25 +149,25 @@ namespace paludis
public:
ChangesToMakeDecision(
const Resolvent &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const bool best,
const ChangeType,
const bool taken,
- const std::tr1::shared_ptr<const Destination> &,
- const std::tr1::function<void (ChangesToMakeDecision &)> &
+ const std::shared_ptr<const Destination> &,
+ const std::function<void (ChangesToMakeDecision &)> &
);
~ChangesToMakeDecision();
- const std::tr1::shared_ptr<const Destination> destination() const
+ const std::shared_ptr<const Destination> destination() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- void set_destination(const std::tr1::shared_ptr<const Destination> &);
+ void set_destination(const std::shared_ptr<const Destination> &);
- const std::tr1::shared_ptr<const PackageID> origin_id() const
+ const std::shared_ptr<const PackageID> origin_id() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const RepositoryName> if_via_new_binary_in() const
+ const std::shared_ptr<const RepositoryName> if_via_new_binary_in() const
PALUDIS_ATTRIBUTE((warn_unused_result));
void set_via_new_binary_in(const RepositoryName &);
@@ -181,12 +181,12 @@ namespace paludis
virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
- void add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> &);
+ virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &);
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<ChangesToMakeDecision> deserialise(
+ static const std::shared_ptr<ChangesToMakeDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -200,22 +200,22 @@ namespace paludis
public:
RemoveDecision(
const Resolvent &,
- const std::tr1::shared_ptr<const PackageIDSequence> &,
+ const std::shared_ptr<const PackageIDSequence> &,
const bool taken);
~RemoveDecision();
virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const PackageIDSequence> ids() const
+ const std::shared_ptr<const PackageIDSequence> ids() const
PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
- void add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> &);
+ virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &);
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<RemoveDecision> deserialise(
+ static const std::shared_ptr<RemoveDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -227,7 +227,7 @@ namespace paludis
public:
UnableToMakeDecision(
const Resolvent &,
- const std::tr1::shared_ptr<const UnsuitableCandidates> &,
+ const std::shared_ptr<const UnsuitableCandidates> &,
const bool taken);
~UnableToMakeDecision();
@@ -236,9 +236,9 @@ namespace paludis
virtual void serialise(Serialiser &) const;
- const std::tr1::shared_ptr<const UnsuitableCandidates> unsuitable_candidates() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const UnsuitableCandidates> unsuitable_candidates() const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<UnableToMakeDecision> deserialise(
+ static const std::shared_ptr<UnableToMakeDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -251,21 +251,21 @@ namespace paludis
public:
BreakDecision(
const Resolvent &,
- const std::tr1::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const PackageID> &,
const bool taken);
~BreakDecision();
- const std::tr1::shared_ptr<const PackageID> existing_id() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageID> existing_id() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual bool taken() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
- void add_required_confirmation(const std::tr1::shared_ptr<const RequiredConfirmation> &);
+ virtual const std::shared_ptr<const RequiredConfirmations> required_confirmations_if_any() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ void add_required_confirmation(const std::shared_ptr<const RequiredConfirmation> &);
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<BreakDecision> deserialise(
+ static const std::shared_ptr<BreakDecision> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/decisions-fwd.hh b/paludis/resolver/decisions-fwd.hh
index ec52a3517..343ea005e 100644
--- a/paludis/resolver/decisions-fwd.hh
+++ b/paludis/resolver/decisions-fwd.hh
@@ -23,7 +23,7 @@
#include <paludis/util/no_type.hh>
#include <paludis/resolver/orderer_notes-fwd.hh>
#include <paludis/resolver/decision-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -32,7 +32,7 @@ namespace paludis
template <typename Decision_, typename Notes_ = NoType<0u> *>
struct Decisions;
- typedef Decisions<ChangeOrRemoveDecision, std::tr1::shared_ptr<const OrdererNotes> > OrderedChangeOrRemoveDecisions;
+ typedef Decisions<ChangeOrRemoveDecision, std::shared_ptr<const OrdererNotes> > OrderedChangeOrRemoveDecisions;
}
}
diff --git a/paludis/resolver/decisions.cc b/paludis/resolver/decisions.cc
index 3e0a27a05..cbf667df2 100644
--- a/paludis/resolver/decisions.cc
+++ b/paludis/resolver/decisions.cc
@@ -37,31 +37,31 @@ namespace
struct ContainerTraits
{
typedef std::list<std::pair<
- std::tr1::shared_ptr<const Decision_>,
+ std::shared_ptr<const Decision_>,
Notes_> > ContainerType;
static void do_push_back(
ContainerType & c,
- const std::tr1::shared_ptr<const Decision_> & d,
+ const std::shared_ptr<const Decision_> & d,
const Notes_ & n)
{
c.push_back(std::make_pair(d, n));
}
static void do_member(SerialiserObjectWriter & w, int n,
- const std::pair<std::tr1::shared_ptr<const Decision_>, Notes_> & d)
+ const std::pair<std::shared_ptr<const Decision_>, Notes_> & d)
{
w.member(SerialiserFlags<serialise::might_be_null>(), stringify(n) + ".1", d.first);
w.member(SerialiserFlags<serialise::might_be_null>(), stringify(n) + ".2", d.second);
}
static void do_extract(
- std::tr1::shared_ptr<Decisions<Decision_, Notes_> > & result,
+ std::shared_ptr<Decisions<Decision_, Notes_> > & result,
Deserialisator & v,
int n)
{
result->push_back(
- v.member<std::tr1::shared_ptr<Decision_> >(stringify(n) + ".1"),
+ v.member<std::shared_ptr<Decision_> >(stringify(n) + ".1"),
v.member<Notes_>(stringify(n) + ".2")
);
}
@@ -70,27 +70,27 @@ namespace
template <typename Decision_>
struct ContainerTraits<Decision_, NoType<0u> *>
{
- typedef std::list<std::tr1::shared_ptr<const Decision_> > ContainerType;
+ typedef std::list<std::shared_ptr<const Decision_> > ContainerType;
static void do_push_back(
ContainerType & c,
- const std::tr1::shared_ptr<const Decision_> & d,
+ const std::shared_ptr<const Decision_> & d,
const NoType<0u> * const)
{
c.push_back(d);
}
- static void do_member(SerialiserObjectWriter & w, int n, const std::tr1::shared_ptr<const Decision_> & d)
+ static void do_member(SerialiserObjectWriter & w, int n, const std::shared_ptr<const Decision_> & d)
{
w.member(SerialiserFlags<serialise::might_be_null>(), stringify(n), d);
}
static void do_extract(
- std::tr1::shared_ptr<Decisions<Decision_> > & result,
+ std::shared_ptr<Decisions<Decision_> > & result,
Deserialisator & v,
int n)
{
- result->push_back(v.member<std::tr1::shared_ptr<Decision_> >(stringify(n)));
+ result->push_back(v.member<std::shared_ptr<Decision_> >(stringify(n)));
}
};
}
@@ -124,7 +124,7 @@ Decisions<Decision_, Notes_>::~Decisions()
template <typename Decision_, typename Notes_>
void
Decisions<Decision_, Notes_>::push_back(
- const std::tr1::shared_ptr<const Decision_> & d,
+ const std::shared_ptr<const Decision_> & d,
const Notes_ & n)
{
ContainerTraits<Decision_, Notes_>::do_push_back(_imp->values, d, n);
@@ -166,11 +166,11 @@ Decisions<Decision_, Notes_>::serialise(Serialiser & s) const
}
template <typename Decision_, typename Notes_>
-const std::tr1::shared_ptr<Decisions<Decision_, Notes_> >
+const std::shared_ptr<Decisions<Decision_, Notes_> >
Decisions<Decision_, Notes_>::deserialise(Deserialisation & d)
{
Deserialisator v(d, "Decisions");
- std::tr1::shared_ptr<Decisions<Decision_, Notes_> > result(new Decisions<Decision_, Notes_>);
+ std::shared_ptr<Decisions<Decision_, Notes_> > result(new Decisions<Decision_, Notes_>);
for (int n(1), n_end(v.member<int>("count") + 1) ; n != n_end ; ++n)
ContainerTraits<Decision_, Notes_>::do_extract(result, v, n);
return result;
@@ -180,18 +180,18 @@ template class Decisions<UnableToMakeDecision>;
template class Decisions<ChangesToMakeDecision>;
template class Decisions<ChangeOrRemoveDecision>;
template class Decisions<ConfirmableDecision>;
-template class Decisions<ChangeOrRemoveDecision, std::tr1::shared_ptr<const OrdererNotes> >;
+template class Decisions<ChangeOrRemoveDecision, std::shared_ptr<const OrdererNotes> >;
template class WrappedForwardIterator<Decisions<UnableToMakeDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const UnableToMakeDecision> >;
+ const std::shared_ptr<const UnableToMakeDecision> >;
template class WrappedForwardIterator<Decisions<ChangesToMakeDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const ChangesToMakeDecision> >;
+ const std::shared_ptr<const ChangesToMakeDecision> >;
template class WrappedForwardIterator<Decisions<ChangeOrRemoveDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const ChangeOrRemoveDecision> >;
+ const std::shared_ptr<const ChangeOrRemoveDecision> >;
template class WrappedForwardIterator<Decisions<ConfirmableDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const ConfirmableDecision> >;
-template class WrappedForwardIterator<Decisions<ChangeOrRemoveDecision, std::tr1::shared_ptr<const OrdererNotes> >::ConstIteratorTag,
+ const std::shared_ptr<const ConfirmableDecision> >;
+template class WrappedForwardIterator<Decisions<ChangeOrRemoveDecision, std::shared_ptr<const OrdererNotes> >::ConstIteratorTag,
const std::pair<
- std::tr1::shared_ptr<const ChangeOrRemoveDecision>,
- std::tr1::shared_ptr<const OrdererNotes> > >;
+ std::shared_ptr<const ChangeOrRemoveDecision>,
+ std::shared_ptr<const OrdererNotes> > >;
diff --git a/paludis/resolver/decisions.hh b/paludis/resolver/decisions.hh
index 406c01ccb..b7cbfbfd0 100644
--- a/paludis/resolver/decisions.hh
+++ b/paludis/resolver/decisions.hh
@@ -27,7 +27,7 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/no_type.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -39,13 +39,13 @@ namespace paludis
template <typename Decision_, typename Notes_>
struct DecisionsIteratorValueType
{
- typedef const std::pair<std::tr1::shared_ptr<const Decision_>, Notes_> Type;
+ typedef const std::pair<std::shared_ptr<const Decision_>, Notes_> Type;
};
template <typename Decision_>
struct DecisionsIteratorValueType<Decision_, NoType<0u> *>
{
- typedef const std::tr1::shared_ptr<const Decision_> Type;
+ typedef const std::shared_ptr<const Decision_> Type;
};
template <typename Decision_, typename Notes_>
@@ -59,7 +59,7 @@ namespace paludis
~Decisions();
void push_back(
- const std::tr1::shared_ptr<const Decision_> &,
+ const std::shared_ptr<const Decision_> &,
const Notes_ & = static_cast<NoType<0u> *>(0));
typedef DecisionsConstIteratorTag<Decision_, Notes_> ConstIteratorTag;
@@ -71,29 +71,29 @@ namespace paludis
bool empty() const PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<Decisions> deserialise(Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<Decisions> deserialise(Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
extern template class Decisions<UnableToMakeDecision>;
extern template class Decisions<ChangesToMakeDecision>;
extern template class Decisions<ChangeOrRemoveDecision>;
extern template class Decisions<ConfirmableDecision>;
- extern template class Decisions<ChangeOrRemoveDecision, std::tr1::shared_ptr<const OrdererNotes> >;
+ extern template class Decisions<ChangeOrRemoveDecision, std::shared_ptr<const OrdererNotes> >;
}
extern template class WrappedForwardIterator<resolver::Decisions<resolver::UnableToMakeDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const resolver::UnableToMakeDecision> >;
+ const std::shared_ptr<const resolver::UnableToMakeDecision> >;
extern template class WrappedForwardIterator<resolver::Decisions<resolver::ChangesToMakeDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const resolver::ChangesToMakeDecision> >;
+ const std::shared_ptr<const resolver::ChangesToMakeDecision> >;
extern template class WrappedForwardIterator<resolver::Decisions<resolver::ChangeOrRemoveDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const resolver::ChangeOrRemoveDecision> >;
+ const std::shared_ptr<const resolver::ChangeOrRemoveDecision> >;
extern template class WrappedForwardIterator<resolver::Decisions<resolver::ConfirmableDecision>::ConstIteratorTag,
- const std::tr1::shared_ptr<const resolver::ConfirmableDecision> >;
+ const std::shared_ptr<const resolver::ConfirmableDecision> >;
extern template class WrappedForwardIterator<resolver::Decisions<resolver::ChangeOrRemoveDecision,
- std::tr1::shared_ptr<const resolver::OrdererNotes> >::ConstIteratorTag,
+ std::shared_ptr<const resolver::OrdererNotes> >::ConstIteratorTag,
const std::pair<
- std::tr1::shared_ptr<const resolver::ChangeOrRemoveDecision>,
- std::tr1::shared_ptr<const resolver::OrdererNotes> > >;
+ std::shared_ptr<const resolver::ChangeOrRemoveDecision>,
+ std::shared_ptr<const resolver::OrdererNotes> > >;
}
#endif
diff --git a/paludis/resolver/destination.cc b/paludis/resolver/destination.cc
index 9d4774404..12ab030b8 100644
--- a/paludis/resolver/destination.cc
+++ b/paludis/resolver/destination.cc
@@ -29,15 +29,15 @@
using namespace paludis;
using namespace paludis::resolver;
-const std::tr1::shared_ptr<Destination>
+const std::shared_ptr<Destination>
Destination::deserialise(Deserialisation & d)
{
Deserialisator v(d, "Destination");
- std::tr1::shared_ptr<PackageIDSequence> replacing(new PackageIDSequence);
+ std::shared_ptr<PackageIDSequence> replacing(new PackageIDSequence);
Deserialisator vv(*v.find_remove_member("replacing"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- replacing->push_back(vv.member<std::tr1::shared_ptr<const PackageID> >(stringify(n)));
+ replacing->push_back(vv.member<std::shared_ptr<const PackageID> >(stringify(n)));
return make_shared_ptr(new Destination(make_named_values<Destination>(
diff --git a/paludis/resolver/destination.hh b/paludis/resolver/destination.hh
index 11acd4115..fa6647d86 100644
--- a/paludis/resolver/destination.hh
+++ b/paludis/resolver/destination.hh
@@ -26,7 +26,7 @@
#include <paludis/util/named_value.hh>
#include <paludis/name.hh>
#include <paludis/package_id-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -40,11 +40,11 @@ namespace paludis
{
struct Destination
{
- NamedValue<n::replacing, std::tr1::shared_ptr<const PackageIDSequence> > replacing;
+ NamedValue<n::replacing, std::shared_ptr<const PackageIDSequence> > replacing;
NamedValue<n::repository, RepositoryName> repository;
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<Destination> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<Destination> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/resolver/job.cc b/paludis/resolver/job.cc
index f2bdf5837..45de5c767 100644
--- a/paludis/resolver/job.cc
+++ b/paludis/resolver/job.cc
@@ -62,7 +62,7 @@ PretendJob::origin_id_spec() const
return _imp->origin_id_spec;
}
-const std::tr1::shared_ptr<PretendJob>
+const std::shared_ptr<PretendJob>
PretendJob::deserialise(Deserialisation & d)
{
Deserialisator v(d, "PretendJob");
@@ -84,7 +84,7 @@ ExecuteJob::~ExecuteJob()
{
}
-const std::tr1::shared_ptr<ExecuteJob>
+const std::shared_ptr<ExecuteJob>
ExecuteJob::deserialise(Deserialisation & d)
{
if (d.class_name() == "FetchJob")
@@ -102,12 +102,12 @@ namespace paludis
template <>
struct Implementation<FetchJob>
{
- const std::tr1::shared_ptr<const JobRequirements> requirements;
+ const std::shared_ptr<const JobRequirements> requirements;
const PackageDepSpec origin_id_spec;
- std::tr1::shared_ptr<JobState> state;
+ std::shared_ptr<JobState> state;
Implementation(
- const std::tr1::shared_ptr<const JobRequirements> & r,
+ const std::shared_ptr<const JobRequirements> & r,
const PackageDepSpec & o) :
requirements(r),
origin_id_spec(o)
@@ -117,7 +117,7 @@ namespace paludis
}
FetchJob::FetchJob(
- const std::tr1::shared_ptr<const JobRequirements> & r,
+ const std::shared_ptr<const JobRequirements> & r,
const PackageDepSpec & o) :
PrivateImplementationPattern<FetchJob>(new Implementation<FetchJob>(r, o))
{
@@ -133,42 +133,42 @@ FetchJob::origin_id_spec() const
return _imp->origin_id_spec;
}
-const std::tr1::shared_ptr<JobState>
+const std::shared_ptr<JobState>
FetchJob::state() const
{
return _imp->state;
}
void
-FetchJob::set_state(const std::tr1::shared_ptr<JobState> & s)
+FetchJob::set_state(const std::shared_ptr<JobState> & s)
{
_imp->state = s;
}
-const std::tr1::shared_ptr<const JobRequirements>
+const std::shared_ptr<const JobRequirements>
FetchJob::requirements() const
{
return _imp->requirements;
}
-const std::tr1::shared_ptr<FetchJob>
+const std::shared_ptr<FetchJob>
FetchJob::deserialise(Deserialisation & d)
{
Deserialisator v(d, "FetchJob");
- std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ std::shared_ptr<JobRequirements> requirements(new JobRequirements);
{
Deserialisator vv(*v.find_remove_member("requirements"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
requirements->push_back(vv.member<JobRequirement>(stringify(n)));
}
- std::tr1::shared_ptr<FetchJob> result(new FetchJob(
+ std::shared_ptr<FetchJob> result(new FetchJob(
requirements,
parse_user_package_dep_spec(v.member<std::string>("origin_id_spec"),
d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation)
));
- result->set_state(v.member<std::tr1::shared_ptr<JobState> >("state"));
+ result->set_state(v.member<std::shared_ptr<JobState> >("state"));
return result;
}
@@ -187,20 +187,20 @@ namespace paludis
template <>
struct Implementation<InstallJob>
{
- const std::tr1::shared_ptr<const JobRequirements> requirements;
+ const std::shared_ptr<const JobRequirements> requirements;
const PackageDepSpec origin_id_spec;
const RepositoryName destination_repository_name;
const DestinationType destination_type;
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > replacing_specs;
+ const std::shared_ptr<const Sequence<PackageDepSpec> > replacing_specs;
- std::tr1::shared_ptr<JobState> state;
+ std::shared_ptr<JobState> state;
Implementation(
- const std::tr1::shared_ptr<const JobRequirements> & q,
+ const std::shared_ptr<const JobRequirements> & q,
const PackageDepSpec & o,
const RepositoryName & d,
const DestinationType t,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > & r
+ const std::shared_ptr<const Sequence<PackageDepSpec> > & r
) :
requirements(q),
origin_id_spec(o),
@@ -213,11 +213,11 @@ namespace paludis
}
InstallJob::InstallJob(
- const std::tr1::shared_ptr<const JobRequirements> & q,
+ const std::shared_ptr<const JobRequirements> & q,
const PackageDepSpec & o,
const RepositoryName & d,
const DestinationType t,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > & r
+ const std::shared_ptr<const Sequence<PackageDepSpec> > & r
) :
PrivateImplementationPattern<InstallJob>(new Implementation<InstallJob>(q, o, d, t, r))
{
@@ -245,36 +245,36 @@ InstallJob::destination_type() const
return _imp->destination_type;
}
-const std::tr1::shared_ptr<const Sequence<PackageDepSpec> >
+const std::shared_ptr<const Sequence<PackageDepSpec> >
InstallJob::replacing_specs() const
{
return _imp->replacing_specs;
}
-const std::tr1::shared_ptr<JobState>
+const std::shared_ptr<JobState>
InstallJob::state() const
{
return _imp->state;
}
void
-InstallJob::set_state(const std::tr1::shared_ptr<JobState> & s)
+InstallJob::set_state(const std::shared_ptr<JobState> & s)
{
_imp->state = s;
}
-const std::tr1::shared_ptr<const JobRequirements>
+const std::shared_ptr<const JobRequirements>
InstallJob::requirements() const
{
return _imp->requirements;
}
-const std::tr1::shared_ptr<InstallJob>
+const std::shared_ptr<InstallJob>
InstallJob::deserialise(Deserialisation & d)
{
Deserialisator v(d, "InstallJob");
- std::tr1::shared_ptr<Sequence<PackageDepSpec> > replacing_specs(new Sequence<PackageDepSpec>);
+ std::shared_ptr<Sequence<PackageDepSpec> > replacing_specs(new Sequence<PackageDepSpec>);
{
Deserialisator vv(*v.find_remove_member("replacing_specs"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
@@ -282,14 +282,14 @@ InstallJob::deserialise(Deserialisation & d)
d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation));
}
- std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ std::shared_ptr<JobRequirements> requirements(new JobRequirements);
{
Deserialisator vv(*v.find_remove_member("requirements"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
requirements->push_back(vv.member<JobRequirement>(stringify(n)));
}
- std::tr1::shared_ptr<InstallJob> result(new InstallJob(
+ std::shared_ptr<InstallJob> result(new InstallJob(
requirements,
parse_user_package_dep_spec(v.member<std::string>("origin_id_spec"),
d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation),
@@ -298,14 +298,14 @@ InstallJob::deserialise(Deserialisation & d)
replacing_specs
));
- result->set_state(v.member<std::tr1::shared_ptr<JobState> >("state"));
+ result->set_state(v.member<std::shared_ptr<JobState> >("state"));
return result;
}
void
InstallJob::serialise(Serialiser & s) const
{
- std::tr1::shared_ptr<Sequence<std::string> > replacing_specs_s(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > replacing_specs_s(new Sequence<std::string>);
for (Sequence<PackageDepSpec>::ConstIterator r(replacing_specs()->begin()),
r_end(replacing_specs()->end()) ;
r != r_end ; ++r)
@@ -326,14 +326,14 @@ namespace paludis
template <>
struct Implementation<UninstallJob>
{
- const std::tr1::shared_ptr<const JobRequirements> requirements;
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > ids_to_remove_specs;
+ const std::shared_ptr<const JobRequirements> requirements;
+ const std::shared_ptr<const Sequence<PackageDepSpec> > ids_to_remove_specs;
- std::tr1::shared_ptr<JobState> state;
+ std::shared_ptr<JobState> state;
Implementation(
- const std::tr1::shared_ptr<const JobRequirements> & q,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > & r
+ const std::shared_ptr<const JobRequirements> & q,
+ const std::shared_ptr<const Sequence<PackageDepSpec> > & r
) :
requirements(q),
ids_to_remove_specs(r)
@@ -343,8 +343,8 @@ namespace paludis
}
UninstallJob::UninstallJob(
- const std::tr1::shared_ptr<const JobRequirements> & q,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > & r
+ const std::shared_ptr<const JobRequirements> & q,
+ const std::shared_ptr<const Sequence<PackageDepSpec> > & r
) :
PrivateImplementationPattern<UninstallJob>(new Implementation<UninstallJob>(q, r))
{
@@ -354,36 +354,36 @@ UninstallJob::~UninstallJob()
{
}
-const std::tr1::shared_ptr<const Sequence<PackageDepSpec> >
+const std::shared_ptr<const Sequence<PackageDepSpec> >
UninstallJob::ids_to_remove_specs() const
{
return _imp->ids_to_remove_specs;
}
-const std::tr1::shared_ptr<JobState>
+const std::shared_ptr<JobState>
UninstallJob::state() const
{
return _imp->state;
}
void
-UninstallJob::set_state(const std::tr1::shared_ptr<JobState> & s)
+UninstallJob::set_state(const std::shared_ptr<JobState> & s)
{
_imp->state = s;
}
-const std::tr1::shared_ptr<const JobRequirements>
+const std::shared_ptr<const JobRequirements>
UninstallJob::requirements() const
{
return _imp->requirements;
}
-const std::tr1::shared_ptr<UninstallJob>
+const std::shared_ptr<UninstallJob>
UninstallJob::deserialise(Deserialisation & d)
{
Deserialisator v(d, "UninstallJob");
- std::tr1::shared_ptr<Sequence<PackageDepSpec> > ids_to_remove_specs(new Sequence<PackageDepSpec> );
+ std::shared_ptr<Sequence<PackageDepSpec> > ids_to_remove_specs(new Sequence<PackageDepSpec> );
{
Deserialisator vv(*v.find_remove_member("ids_to_remove_specs"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
@@ -391,26 +391,26 @@ UninstallJob::deserialise(Deserialisation & d)
d.deserialiser().environment(), UserPackageDepSpecOptions() + updso_no_disambiguation));
}
- std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ std::shared_ptr<JobRequirements> requirements(new JobRequirements);
{
Deserialisator vv(*v.find_remove_member("requirements"), "c");
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
requirements->push_back(vv.member<JobRequirement>(stringify(n)));
}
- std::tr1::shared_ptr<UninstallJob> result(new UninstallJob(
+ std::shared_ptr<UninstallJob> result(new UninstallJob(
requirements,
ids_to_remove_specs
));
- result->set_state(v.member<std::tr1::shared_ptr<JobState> >("state"));
+ result->set_state(v.member<std::shared_ptr<JobState> >("state"));
return result;
}
void
UninstallJob::serialise(Serialiser & s) const
{
- std::tr1::shared_ptr<Sequence<std::string> > ids_to_remove_specs_s(new Sequence<std::string>);
+ std::shared_ptr<Sequence<std::string> > ids_to_remove_specs_s(new Sequence<std::string>);
for (Sequence<PackageDepSpec>::ConstIterator r(ids_to_remove_specs()->begin()),
r_end(ids_to_remove_specs()->end()) ;
r != r_end ; ++r)
diff --git a/paludis/resolver/job.hh b/paludis/resolver/job.hh
index a6e081abf..f7065f17b 100644
--- a/paludis/resolver/job.hh
+++ b/paludis/resolver/job.hh
@@ -30,7 +30,7 @@
#include <paludis/dep_spec-fwd.hh>
#include <paludis/serialise-fwd.hh>
#include <paludis/name-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -47,7 +47,7 @@ namespace paludis
const PackageDepSpec origin_id_spec() const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<PretendJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<PretendJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
};
@@ -58,12 +58,12 @@ namespace paludis
public:
virtual ~ExecuteJob();
- virtual const std::tr1::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- virtual void set_state(const std::tr1::shared_ptr<JobState> &) = 0;
+ virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
+ virtual void set_state(const std::shared_ptr<JobState> &) = 0;
- virtual const std::tr1::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
+ virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result)) = 0;
- static const std::tr1::shared_ptr<ExecuteJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<ExecuteJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const = 0;
};
@@ -74,19 +74,19 @@ namespace paludis
{
public:
FetchJob(
- const std::tr1::shared_ptr<const JobRequirements> &,
+ const std::shared_ptr<const JobRequirements> &,
const PackageDepSpec &
);
~FetchJob();
const PackageDepSpec origin_id_spec() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual void set_state(const std::tr1::shared_ptr<JobState> &);
+ virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual void set_state(const std::shared_ptr<JobState> &);
- virtual const std::tr1::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<FetchJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<FetchJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
@@ -97,24 +97,24 @@ namespace paludis
{
public:
InstallJob(
- const std::tr1::shared_ptr<const JobRequirements> &,
+ const std::shared_ptr<const JobRequirements> &,
const PackageDepSpec &,
const RepositoryName &,
const DestinationType,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > &);
+ const std::shared_ptr<const Sequence<PackageDepSpec> > &);
~InstallJob();
const PackageDepSpec origin_id_spec() const PALUDIS_ATTRIBUTE((warn_unused_result));
const RepositoryName destination_repository_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
DestinationType destination_type() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > replacing_specs() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Sequence<PackageDepSpec> > replacing_specs() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual void set_state(const std::tr1::shared_ptr<JobState> &);
+ virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual void set_state(const std::shared_ptr<JobState> &);
- virtual const std::tr1::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<InstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<InstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
@@ -125,19 +125,19 @@ namespace paludis
{
public:
UninstallJob(
- const std::tr1::shared_ptr<const JobRequirements> &,
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > &
+ const std::shared_ptr<const JobRequirements> &,
+ const std::shared_ptr<const Sequence<PackageDepSpec> > &
);
~UninstallJob();
- const std::tr1::shared_ptr<const Sequence<PackageDepSpec> > ids_to_remove_specs() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Sequence<PackageDepSpec> > ids_to_remove_specs() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual const std::tr1::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
- virtual void set_state(const std::tr1::shared_ptr<JobState> &);
+ virtual const std::shared_ptr<JobState> state() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual void set_state(const std::shared_ptr<JobState> &);
- virtual const std::tr1::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ virtual const std::shared_ptr<const JobRequirements> requirements() const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<UninstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<UninstallJob> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
}
diff --git a/paludis/resolver/job_list.cc b/paludis/resolver/job_list.cc
index 5392f3440..167e6d9e0 100644
--- a/paludis/resolver/job_list.cc
+++ b/paludis/resolver/job_list.cc
@@ -32,13 +32,13 @@ namespace paludis
template <typename Job_>
struct Implementation<JobList<Job_> >
{
- std::vector<std::tr1::shared_ptr<Job_> > list;
+ std::vector<std::shared_ptr<Job_> > list;
};
template <typename Job_>
struct WrappedForwardIteratorTraits<JobListConstIteratorTag<Job_> >
{
- typedef typename std::vector<std::tr1::shared_ptr<Job_> >::const_iterator UnderlyingIterator;
+ typedef typename std::vector<std::shared_ptr<Job_> >::const_iterator UnderlyingIterator;
};
}
@@ -55,9 +55,9 @@ JobList<Job_>::~JobList()
template <typename Job_>
JobNumber
-JobList<Job_>::append(const std::tr1::shared_ptr<Job_> & i)
+JobList<Job_>::append(const std::shared_ptr<Job_> & i)
{
- typename std::vector<std::tr1::shared_ptr<Job_> >::const_iterator p(_imp->list.insert(_imp->list.end(), i));
+ typename std::vector<std::shared_ptr<Job_> >::const_iterator p(_imp->list.insert(_imp->list.end(), i));
return p - _imp->list.begin();
}
@@ -90,14 +90,14 @@ JobList<Job_>::fetch(const JobNumber n) const
}
template <typename Job_>
-const std::tr1::shared_ptr<JobList<Job_> >
+const std::shared_ptr<JobList<Job_> >
JobList<Job_>::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobList");
Deserialisator vv(*v.find_remove_member("items"), "c");
- std::tr1::shared_ptr<JobList> result(new JobList);
+ std::shared_ptr<JobList> result(new JobList);
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->append(vv.member<std::tr1::shared_ptr<Job_> >(stringify(n)));
+ result->append(vv.member<std::shared_ptr<Job_> >(stringify(n)));
return result;
}
@@ -111,8 +111,8 @@ JobList<Job_>::serialise(Serialiser & s) const
}
template class JobList<PretendJob>;
-template class WrappedForwardIterator<JobListConstIteratorTag<PretendJob>, const std::tr1::shared_ptr<PretendJob> >;
+template class WrappedForwardIterator<JobListConstIteratorTag<PretendJob>, const std::shared_ptr<PretendJob> >;
template class JobList<ExecuteJob>;
-template class WrappedForwardIterator<JobListConstIteratorTag<ExecuteJob>, const std::tr1::shared_ptr<ExecuteJob> >;
+template class WrappedForwardIterator<JobListConstIteratorTag<ExecuteJob>, const std::shared_ptr<ExecuteJob> >;
diff --git a/paludis/resolver/job_list.hh b/paludis/resolver/job_list.hh
index 3765719cb..d7fd987d9 100644
--- a/paludis/resolver/job_list.hh
+++ b/paludis/resolver/job_list.hh
@@ -25,7 +25,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -45,17 +45,17 @@ namespace paludis
JobList();
~JobList();
- JobNumber append(const std::tr1::shared_ptr<Job_> &);
+ JobNumber append(const std::shared_ptr<Job_> &);
int length() const PALUDIS_ATTRIBUTE((warn_unused_result));
typedef JobListConstIteratorTag<Job_> ConstIteratorTag;
- typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<Job_> > ConstIterator;
+ typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<Job_> > ConstIterator;
ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result));
ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result));
ConstIterator fetch(const JobNumber) const PALUDIS_ATTRIBUTE((warn_unused_result));
- static const std::tr1::shared_ptr<JobList<Job_> > deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobList<Job_> > deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
};
@@ -64,9 +64,9 @@ namespace paludis
}
extern template class WrappedForwardIterator<resolver::JobListConstIteratorTag<resolver::PretendJob>,
- const std::tr1::shared_ptr<resolver::PretendJob> >;
+ const std::shared_ptr<resolver::PretendJob> >;
extern template class WrappedForwardIterator<resolver::JobListConstIteratorTag<resolver::ExecuteJob>,
- const std::tr1::shared_ptr<resolver::ExecuteJob> >;
+ const std::shared_ptr<resolver::ExecuteJob> >;
}
#endif
diff --git a/paludis/resolver/job_lists.cc b/paludis/resolver/job_lists.cc
index 9552ee3fe..69fb5297c 100644
--- a/paludis/resolver/job_lists.cc
+++ b/paludis/resolver/job_lists.cc
@@ -35,14 +35,14 @@ JobLists::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<JobLists>
+const std::shared_ptr<JobLists>
JobLists::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobLists");
return make_shared_copy(make_named_values<JobLists>(
- n::execute_job_list() = v.member<std::tr1::shared_ptr<JobList<ExecuteJob> > >("execute_job_list"),
- n::pretend_job_list() = v.member<std::tr1::shared_ptr<JobList<PretendJob> > >("pretend_job_list")
+ n::execute_job_list() = v.member<std::shared_ptr<JobList<ExecuteJob> > >("execute_job_list"),
+ n::pretend_job_list() = v.member<std::shared_ptr<JobList<PretendJob> > >("pretend_job_list")
));
}
diff --git a/paludis/resolver/job_lists.hh b/paludis/resolver/job_lists.hh
index 10f5f4d5d..4901b4ba9 100644
--- a/paludis/resolver/job_lists.hh
+++ b/paludis/resolver/job_lists.hh
@@ -25,7 +25,7 @@
#include <paludis/resolver/job-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -39,10 +39,10 @@ namespace paludis
{
struct JobLists
{
- NamedValue<n::execute_job_list, std::tr1::shared_ptr<JobList<ExecuteJob> > > execute_job_list;
- NamedValue<n::pretend_job_list, std::tr1::shared_ptr<JobList<PretendJob> > > pretend_job_list;
+ NamedValue<n::execute_job_list, std::shared_ptr<JobList<ExecuteJob> > > execute_job_list;
+ NamedValue<n::pretend_job_list, std::shared_ptr<JobList<PretendJob> > > pretend_job_list;
- static const std::tr1::shared_ptr<JobLists> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobLists> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
};
}
diff --git a/paludis/resolver/job_state.cc b/paludis/resolver/job_state.cc
index e3a04939a..0d44f50b5 100644
--- a/paludis/resolver/job_state.cc
+++ b/paludis/resolver/job_state.cc
@@ -30,15 +30,15 @@ namespace paludis
template <>
struct Implementation<JobActiveState>
{
- std::tr1::shared_ptr<OutputManager> output_manager;
+ std::shared_ptr<OutputManager> output_manager;
};
template <>
struct Implementation<JobSucceededState>
{
- const std::tr1::shared_ptr<OutputManager> output_manager;
+ const std::shared_ptr<OutputManager> output_manager;
- Implementation(const std::tr1::shared_ptr<OutputManager> & m) :
+ Implementation(const std::shared_ptr<OutputManager> & m) :
output_manager(m)
{
}
@@ -47,9 +47,9 @@ namespace paludis
template <>
struct Implementation<JobFailedState>
{
- const std::tr1::shared_ptr<OutputManager> output_manager;
+ const std::shared_ptr<OutputManager> output_manager;
- Implementation(const std::tr1::shared_ptr<OutputManager> & m) :
+ Implementation(const std::shared_ptr<OutputManager> & m) :
output_manager(m)
{
}
@@ -60,7 +60,7 @@ JobState::~JobState()
{
}
-const std::tr1::shared_ptr<JobState>
+const std::shared_ptr<JobState>
JobState::deserialise(Deserialisation & d)
{
if (d.class_name() == "JobPendingState")
@@ -77,7 +77,7 @@ JobState::deserialise(Deserialisation & d)
throw InternalError(PALUDIS_HERE, "unknown class '" + stringify(d.class_name()) + "'");
}
-const std::tr1::shared_ptr<JobPendingState>
+const std::shared_ptr<JobPendingState>
JobPendingState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobPendingState");
@@ -91,7 +91,7 @@ JobPendingState::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<JobSkippedState>
+const std::shared_ptr<JobSkippedState>
JobSkippedState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobSkippedState");
@@ -115,30 +115,30 @@ JobActiveState::~JobActiveState()
}
void
-JobActiveState::set_output_manager(const std::tr1::shared_ptr<OutputManager> & m)
+JobActiveState::set_output_manager(const std::shared_ptr<OutputManager> & m)
{
_imp->output_manager = m;
}
-const std::tr1::shared_ptr<OutputManager>
+const std::shared_ptr<OutputManager>
JobActiveState::output_manager() const
{
return _imp->output_manager;
}
-const std::tr1::shared_ptr<JobSucceededState>
+const std::shared_ptr<JobSucceededState>
JobActiveState::succeeded() const
{
return make_shared_ptr(new JobSucceededState(_imp->output_manager));
}
-const std::tr1::shared_ptr<JobFailedState>
+const std::shared_ptr<JobFailedState>
JobActiveState::failed() const
{
return make_shared_ptr(new JobFailedState(_imp->output_manager));
}
-const std::tr1::shared_ptr<JobActiveState>
+const std::shared_ptr<JobActiveState>
JobActiveState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobActiveState");
@@ -152,7 +152,7 @@ JobActiveState::serialise(Serialiser & s) const
;
}
-JobSucceededState::JobSucceededState(const std::tr1::shared_ptr<OutputManager> & m) :
+JobSucceededState::JobSucceededState(const std::shared_ptr<OutputManager> & m) :
PrivateImplementationPattern<JobSucceededState>(new Implementation<JobSucceededState>(m))
{
}
@@ -161,13 +161,13 @@ JobSucceededState::~JobSucceededState()
{
}
-const std::tr1::shared_ptr<OutputManager>
+const std::shared_ptr<OutputManager>
JobSucceededState::output_manager() const
{
return _imp->output_manager;
}
-const std::tr1::shared_ptr<JobSucceededState>
+const std::shared_ptr<JobSucceededState>
JobSucceededState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobSucceededState");
@@ -181,7 +181,7 @@ JobSucceededState::serialise(Serialiser & s) const
;
}
-JobFailedState::JobFailedState(const std::tr1::shared_ptr<OutputManager> & m) :
+JobFailedState::JobFailedState(const std::shared_ptr<OutputManager> & m) :
PrivateImplementationPattern<JobFailedState>(new Implementation<JobFailedState>(m))
{
}
@@ -190,13 +190,13 @@ JobFailedState::~JobFailedState()
{
}
-const std::tr1::shared_ptr<OutputManager>
+const std::shared_ptr<OutputManager>
JobFailedState::output_manager() const
{
return _imp->output_manager;
}
-const std::tr1::shared_ptr<JobFailedState>
+const std::shared_ptr<JobFailedState>
JobFailedState::deserialise(Deserialisation & d)
{
Deserialisator v(d, "JobFailedState");
diff --git a/paludis/resolver/job_state.hh b/paludis/resolver/job_state.hh
index 5cb3198dc..8817e0c90 100644
--- a/paludis/resolver/job_state.hh
+++ b/paludis/resolver/job_state.hh
@@ -26,7 +26,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/output_manager-fwd.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -40,7 +40,7 @@ namespace paludis
virtual ~JobState() = 0;
virtual void serialise(Serialiser &) const = 0;
- static const std::tr1::shared_ptr<JobState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE JobPendingState :
@@ -49,7 +49,7 @@ namespace paludis
{
public:
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<JobPendingState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobPendingState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE JobActiveState :
@@ -61,14 +61,14 @@ namespace paludis
JobActiveState();
~JobActiveState();
- void set_output_manager(const std::tr1::shared_ptr<OutputManager> &);
- const std::tr1::shared_ptr<JobSucceededState> succeeded() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<JobFailedState> failed() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ void set_output_manager(const std::shared_ptr<OutputManager> &);
+ const std::shared_ptr<JobSucceededState> succeeded() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<JobFailedState> failed() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<JobActiveState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobActiveState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE JobSucceededState :
@@ -77,13 +77,13 @@ namespace paludis
public ImplementAcceptMethods<JobState, JobSucceededState>
{
public:
- JobSucceededState(const std::tr1::shared_ptr<OutputManager> &);
+ JobSucceededState(const std::shared_ptr<OutputManager> &);
~JobSucceededState();
- const std::tr1::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<JobSucceededState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobSucceededState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE JobFailedState :
@@ -92,13 +92,13 @@ namespace paludis
public ImplementAcceptMethods<JobState, JobFailedState>
{
public:
- JobFailedState(const std::tr1::shared_ptr<OutputManager> &);
+ JobFailedState(const std::shared_ptr<OutputManager> &);
~JobFailedState();
- const std::tr1::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<OutputManager> output_manager() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<JobFailedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobFailedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE JobSkippedState :
@@ -107,7 +107,7 @@ namespace paludis
{
public:
virtual void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<JobSkippedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<JobSkippedState> deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/resolver/nag.cc b/paludis/resolver/nag.cc
index 0f5b04e07..f26e79f8e 100644
--- a/paludis/resolver/nag.cc
+++ b/paludis/resolver/nag.cc
@@ -34,8 +34,8 @@
#include <paludis/util/join.hh>
#include <paludis/util/tribool.hh>
#include <paludis/serialise-impl.hh>
-#include <tr1/unordered_set>
-#include <tr1/unordered_map>
+#include <unordered_set>
+#include <unordered_map>
#include <algorithm>
#include <list>
#include <set>
@@ -45,10 +45,10 @@ using namespace paludis::resolver;
#include <paludis/resolver/nag-se.cc>
-typedef std::tr1::unordered_set<NAGIndex, Hash<NAGIndex> > Nodes;
-typedef std::tr1::unordered_map<NAGIndex, NAGEdgeProperties, Hash<NAGIndex> > NodesWithProperties;
-typedef std::tr1::unordered_map<NAGIndex, NodesWithProperties, Hash<NAGIndex> > Edges;
-typedef std::tr1::unordered_map<NAGIndex, Nodes, Hash<NAGIndex> > PlainEdges;
+typedef std::unordered_set<NAGIndex, Hash<NAGIndex> > Nodes;
+typedef std::unordered_map<NAGIndex, NAGEdgeProperties, Hash<NAGIndex> > NodesWithProperties;
+typedef std::unordered_map<NAGIndex, NodesWithProperties, Hash<NAGIndex> > Edges;
+typedef std::unordered_map<NAGIndex, Nodes, Hash<NAGIndex> > PlainEdges;
std::size_t
NAGIndex::hash() const
@@ -177,10 +177,10 @@ namespace
NamedValue<n::lowlink, int> lowlink;
};
- typedef std::tr1::unordered_map<NAGIndex, TarjanData, Hash<NAGIndex> > TarjanDataMap;
+ typedef std::unordered_map<NAGIndex, TarjanData, Hash<NAGIndex> > TarjanDataMap;
typedef std::list<NAGIndex> TarjanStack;
- typedef std::tr1::unordered_map<NAGIndex, StronglyConnectedComponent, Hash<NAGIndex> > StronglyConnectedComponentsByRepresentative;
- typedef std::tr1::unordered_map<NAGIndex, NAGIndex, Hash<NAGIndex> > RepresentativeNodes;
+ typedef std::unordered_map<NAGIndex, StronglyConnectedComponent, Hash<NAGIndex> > StronglyConnectedComponentsByRepresentative;
+ typedef std::unordered_map<NAGIndex, NAGIndex, Hash<NAGIndex> > RepresentativeNodes;
TarjanDataMap::iterator tarjan(const NAGIndex & node, const Edges & edges, TarjanDataMap & data, TarjanStack & stack, int & index,
StronglyConnectedComponentsByRepresentative & result)
@@ -229,7 +229,7 @@ namespace
return node_data;
}
- int order_score_one(const NAGIndex & n, const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn)
+ int order_score_one(const NAGIndex & n, const std::function<Tribool (const NAGIndex &)> & order_early_fn)
{
/* lower scores are 'better' and mean 'order earlier' */
Tribool order_early(order_early_fn(n));
@@ -255,7 +255,7 @@ namespace
}
std::pair<int, NAGIndex> order_score(const NAGIndex & r, const StronglyConnectedComponent & scc,
- const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn)
+ const std::function<Tribool (const NAGIndex &)> & order_early_fn)
{
int best_score(-1);
@@ -271,9 +271,9 @@ namespace
}
}
-const std::tr1::shared_ptr<const SortedStronglyConnectedComponents>
+const std::shared_ptr<const SortedStronglyConnectedComponents>
NAG::sorted_strongly_connected_components(
- const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn
+ const std::function<Tribool (const NAGIndex &)> & order_early_fn
) const
{
StronglyConnectedComponentsByRepresentative sccs;
@@ -320,7 +320,7 @@ NAG::sorted_strongly_connected_components(
/* topological sort with consistent ordering (mostly to make test cases
* easier). we know there're no cycles. */
- std::tr1::shared_ptr<SortedStronglyConnectedComponents> result(new SortedStronglyConnectedComponents);
+ std::shared_ptr<SortedStronglyConnectedComponents> result(new SortedStronglyConnectedComponents);
typedef std::set<std::pair<int, NAGIndex> > OrderableNow;
OrderableNow orderable_now;
@@ -415,13 +415,13 @@ NAG::serialise(Serialiser & s) const
w.member(SerialiserFlags<>(), "edge.count", stringify(c));
}
-const std::tr1::shared_ptr<NAG>
+const std::shared_ptr<NAG>
NAG::deserialise(Deserialisation & d)
{
Context context("When deserialising NAG:");
Deserialisator v(d, "NAG");
- std::tr1::shared_ptr<NAG> result(new NAG);
+ std::shared_ptr<NAG> result(new NAG);
{
Deserialisator vv(*v.find_remove_member("nodes"), "c");
diff --git a/paludis/resolver/nag.hh b/paludis/resolver/nag.hh
index 9a8003964..06b508429 100644
--- a/paludis/resolver/nag.hh
+++ b/paludis/resolver/nag.hh
@@ -27,8 +27,8 @@
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/named_value.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
-#include <tr1/functional>
+#include <memory>
+#include <functional>
namespace paludis
{
@@ -80,8 +80,8 @@ namespace paludis
void verify_edges() const;
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> sorted_strongly_connected_components(
- const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn
+ const std::shared_ptr<const SortedStronglyConnectedComponents> sorted_strongly_connected_components(
+ const std::function<Tribool (const NAGIndex &)> & order_early_fn
) const PALUDIS_ATTRIBUTE((warn_unused_result));
struct EdgesFromConstIteratorTag;
@@ -95,7 +95,7 @@ namespace paludis
NodesConstIterator end_nodes() const PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<NAG> deserialise(Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
+ static const std::shared_ptr<NAG> deserialise(Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/orderer.cc b/paludis/resolver/orderer.cc
index f8a1fa8d4..5fd73923b 100644
--- a/paludis/resolver/orderer.cc
+++ b/paludis/resolver/orderer.cc
@@ -34,7 +34,6 @@
#include <paludis/resolver/destination.hh>
#include <paludis/resolver/orderer_notes.hh>
#include <paludis/resolver/change_by_resolvent.hh>
-#include <paludis/resolver/resolver_functions.hh>
#include <paludis/resolver/labels_classifier.hh>
#include <paludis/util/private_implementation_pattern-impl.hh>
#include <paludis/util/exception.hh>
@@ -49,17 +48,17 @@
#include <paludis/util/enum_iterator.hh>
#include <paludis/environment.hh>
#include <paludis/notifier_callback.hh>
-#include <tr1/unordered_set>
-#include <tr1/unordered_map>
+#include <unordered_set>
+#include <unordered_map>
#include <algorithm>
#include <list>
using namespace paludis;
using namespace paludis::resolver;
-typedef std::tr1::unordered_map<NAGIndex, std::tr1::shared_ptr<const ChangeOrRemoveDecision>, Hash<NAGIndex> > ChangeOrRemoveIndices;
-typedef std::tr1::unordered_map<NAGIndex, JobNumber, Hash<NAGIndex> > ChangeOrRemoveJobNumbers;
-typedef std::tr1::unordered_map<Resolvent, JobNumber, Hash<Resolvent> > FetchJobNumbers;
+typedef std::unordered_map<NAGIndex, std::shared_ptr<const ChangeOrRemoveDecision>, Hash<NAGIndex> > ChangeOrRemoveIndices;
+typedef std::unordered_map<NAGIndex, JobNumber, Hash<NAGIndex> > ChangeOrRemoveJobNumbers;
+typedef std::unordered_map<Resolvent, JobNumber, Hash<Resolvent> > FetchJobNumbers;
namespace paludis
{
@@ -68,7 +67,7 @@ namespace paludis
{
const Environment * const env;
const ResolverFunctions fns;
- const std::tr1::shared_ptr<Resolved> resolved;
+ const std::shared_ptr<Resolved> resolved;
ChangeOrRemoveIndices change_or_remove_indices;
FetchJobNumbers fetch_job_numbers;
ChangeOrRemoveJobNumbers change_or_remove_job_numbers;
@@ -76,7 +75,7 @@ namespace paludis
Implementation(
const Environment * const e,
const ResolverFunctions & f,
- const std::tr1::shared_ptr<Resolved> & r) :
+ const std::shared_ptr<Resolved> & r) :
env(e),
fns(f),
resolved(r)
@@ -88,7 +87,7 @@ namespace paludis
Orderer::Orderer(
const Environment * const e,
const ResolverFunctions & f,
- const std::tr1::shared_ptr<Resolved> & r) :
+ const std::shared_ptr<Resolved> & r) :
PrivateImplementationPattern<Orderer>(new Implementation<Orderer>(e, f, r))
{
}
@@ -99,22 +98,22 @@ Orderer::~Orderer()
namespace
{
- typedef std::tr1::unordered_set<Resolvent, Hash<Resolvent> > ResolventsSet;
+ typedef std::unordered_set<Resolvent, Hash<Resolvent> > ResolventsSet;
struct DecisionDispatcher
{
- const std::tr1::shared_ptr<Resolved> resolved;
+ const std::shared_ptr<Resolved> resolved;
ResolventsSet & ignore_dependencies_from_resolvents;
ChangeOrRemoveIndices & change_or_remove_indices;
const Resolvent resolvent;
- const std::tr1::shared_ptr<const Decision> decision;
+ const std::shared_ptr<const Decision> decision;
DecisionDispatcher(
- const std::tr1::shared_ptr<Resolved> & r,
+ const std::shared_ptr<Resolved> & r,
ResolventsSet & i,
ChangeOrRemoveIndices & c,
const Resolvent & v,
- const std::tr1::shared_ptr<const Decision> & d) :
+ const std::shared_ptr<const Decision> & d) :
resolved(r),
ignore_dependencies_from_resolvents(i),
change_or_remove_indices(c),
@@ -127,10 +126,10 @@ namespace
{
if (decision->taken())
resolved->taken_unable_to_make_decisions()->push_back(
- std::tr1::static_pointer_cast<const UnableToMakeDecision>(decision));
+ std::static_pointer_cast<const UnableToMakeDecision>(decision));
else
resolved->untaken_unable_to_make_decisions()->push_back(
- std::tr1::static_pointer_cast<const UnableToMakeDecision>(decision));
+ std::static_pointer_cast<const UnableToMakeDecision>(decision));
ignore_dependencies_from_resolvents.insert(resolvent);
@@ -165,7 +164,7 @@ namespace
));
resolved->nag()->add_node(fetched_index);
change_or_remove_indices.insert(std::make_pair(fetched_index,
- std::tr1::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
+ std::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
NAGIndex done_index(make_named_values<NAGIndex>(
n::resolvent() = resolvent,
@@ -173,7 +172,7 @@ namespace
));
resolved->nag()->add_node(done_index);
change_or_remove_indices.insert(std::make_pair(done_index,
- std::tr1::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
+ std::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
resolved->nag()->add_edge(done_index, fetched_index,
make_named_values<NAGEdgeProperties>(
@@ -188,7 +187,7 @@ namespace
else
{
resolved->untaken_change_or_remove_decisions()->push_back(
- std::tr1::static_pointer_cast<const ChangesToMakeDecision>(decision));
+ std::static_pointer_cast<const ChangesToMakeDecision>(decision));
return false;
}
}
@@ -203,13 +202,13 @@ namespace
));
resolved->nag()->add_node(index);
change_or_remove_indices.insert(std::make_pair(index,
- std::tr1::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
+ std::static_pointer_cast<const ChangeOrRemoveDecision>(decision)));
return true;
}
else
{
resolved->untaken_change_or_remove_decisions()->push_back(
- std::tr1::static_pointer_cast<const ChangeOrRemoveDecision>(decision));
+ std::static_pointer_cast<const ChangeOrRemoveDecision>(decision));
return false;
}
}
@@ -218,23 +217,23 @@ namespace
{
if (d.required_confirmations_if_any())
resolved->taken_unconfirmed_decisions()->push_back(
- std::tr1::static_pointer_cast<const BreakDecision>(decision));
+ std::static_pointer_cast<const BreakDecision>(decision));
return false;
}
};
struct EdgesFromReasonVisitor
{
- const std::tr1::shared_ptr<NAG> nag;
+ const std::shared_ptr<NAG> nag;
const ResolventsSet & ignore_dependencies_from_resolvents;
const Resolvent resolvent;
- const std::tr1::function<NAGIndexRole (const Resolvent &)> role_for_fetching;
+ const std::function<NAGIndexRole (const Resolvent &)> role_for_fetching;
EdgesFromReasonVisitor(
- const std::tr1::shared_ptr<NAG> & n,
+ const std::shared_ptr<NAG> & n,
const ResolventsSet & i,
const Resolvent & v,
- const std::tr1::function<NAGIndexRole (const Resolvent &)> & f) :
+ const std::function<NAGIndexRole (const Resolvent &)> & f) :
nag(n),
ignore_dependencies_from_resolvents(i),
resolvent(v),
@@ -437,7 +436,7 @@ Orderer::resolve()
_add_binary_cleverness(*r);
EdgesFromReasonVisitor edges_from_reason_visitor(_imp->resolved->nag(), ignore_dependencies_from_resolvents, (*r)->resolvent(),
- std::tr1::bind(&Orderer::_role_for_fetching, this, std::tr1::placeholders::_1));
+ std::bind(&Orderer::_role_for_fetching, this, std::placeholders::_1));
for (Constraints::ConstIterator c((*r)->constraints()->begin()),
c_end((*r)->constraints()->end()) ;
c != c_end ; ++c)
@@ -446,10 +445,10 @@ Orderer::resolve()
_imp->resolved->nag()->verify_edges();
- const std::tr1::function<Tribool (const NAGIndex &)> order_early_fn(std::tr1::bind(&Orderer::_order_early, this, std::tr1::placeholders::_1));
+ const std::function<Tribool (const NAGIndex &)> order_early_fn(std::bind(&Orderer::_order_early, this, std::placeholders::_1));
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStageEvent("Finding NAG SCCs"));
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> ssccs(
+ const std::shared_ptr<const SortedStronglyConnectedComponents> ssccs(
_imp->resolved->nag()->sorted_strongly_connected_components(order_early_fn));
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStageEvent("Ordering SCCs"));
@@ -462,7 +461,7 @@ Orderer::resolve()
* nodes. this matters for cycle resolution. we identify them now, even
* though our scc might just contain a single install, rather than
* adding in extra useless code for the special easy case. */
- typedef std::tr1::unordered_set<NAGIndex, Hash<NAGIndex> > ChangesInSCC;
+ typedef std::unordered_set<NAGIndex, Hash<NAGIndex> > ChangesInSCC;
ChangesInSCC changes_in_scc;
for (Set<NAGIndex>::ConstIterator r(scc->nodes()->begin()), r_end(scc->nodes()->end()) ;
@@ -507,14 +506,14 @@ Orderer::resolve()
scc_nag.verify_edges();
/* now we try again, hopefully with lots of small SCCs now */
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> sub_ssccs(scc_nag.sorted_strongly_connected_components(order_early_fn));
+ const std::shared_ptr<const SortedStronglyConnectedComponents> sub_ssccs(scc_nag.sorted_strongly_connected_components(order_early_fn));
_order_sub_ssccs(scc_nag, *scc, sub_ssccs, true, order_early_fn);
}
}
}
void
-Orderer::_add_binary_cleverness(const std::tr1::shared_ptr<const Resolution> & resolution)
+Orderer::_add_binary_cleverness(const std::shared_ptr<const Resolution> & resolution)
{
if (resolution->resolvent().destination_type() != dt_create_binary)
return;
@@ -576,9 +575,9 @@ void
Orderer::_order_sub_ssccs(
const NAG & scc_nag,
const StronglyConnectedComponent & top_scc,
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> & sub_ssccs,
+ const std::shared_ptr<const SortedStronglyConnectedComponents> & sub_ssccs,
const bool can_recurse,
- const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn)
+ const std::function<Tribool (const NAGIndex &)> & order_early_fn)
{
Context context("When ordering SSCCs" + std::string(can_recurse ? " for the first time" : " for the second time") + ":");
@@ -636,7 +635,7 @@ Orderer::_order_sub_ssccs(
scc_nag_without_met_deps.verify_edges();
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> sub_ssccs_without_met_deps(
+ const std::shared_ptr<const SortedStronglyConnectedComponents> sub_ssccs_without_met_deps(
scc_nag_without_met_deps.sorted_strongly_connected_components(order_early_fn));
_order_sub_ssccs(scc_nag_without_met_deps, top_scc, sub_ssccs_without_met_deps, false, order_early_fn);
}
@@ -664,13 +663,13 @@ Orderer::_order_sub_ssccs(
namespace
{
- typedef std::tr1::unordered_set<NAGIndex, Hash<NAGIndex> > RecursedRequirements;
+ typedef std::unordered_set<NAGIndex, Hash<NAGIndex> > RecursedRequirements;
void populate_requirements(
- const std::tr1::shared_ptr<const NAG> & nag,
+ const std::shared_ptr<const NAG> & nag,
const ChangeOrRemoveJobNumbers & change_or_remove_job_numbers,
const NAGIndex & index,
- const std::tr1::shared_ptr<JobRequirements> & requirements,
+ const std::shared_ptr<JobRequirements> & requirements,
const bool is_uninstall,
const bool is_fetch,
const bool recursing,
@@ -716,8 +715,8 @@ namespace
void
Orderer::_check_self_deps_and_schedule(
const NAGIndex & index,
- const std::tr1::shared_ptr<const ChangeOrRemoveDecision> & d,
- const std::tr1::shared_ptr<OrdererNotes> & n)
+ const std::shared_ptr<const ChangeOrRemoveDecision> & d,
+ const std::shared_ptr<OrdererNotes> & n)
{
/* do we dep directly upon ourself? */
bool direct_self_dep(false), self_dep_is_met(true), self_dep_is_not_build(true);
@@ -770,13 +769,13 @@ namespace
struct ExtraScheduler
{
- const std::tr1::shared_ptr<const Resolved> resolved;
+ const std::shared_ptr<const Resolved> resolved;
FetchJobNumbers & fetch_job_numbers;
ChangeOrRemoveJobNumbers & change_or_remove_job_numbers;
const NAGIndex index;
ExtraScheduler(
- const std::tr1::shared_ptr<const Resolved> & r,
+ const std::shared_ptr<const Resolved> & r,
FetchJobNumbers & f,
ChangeOrRemoveJobNumbers & i,
const NAGIndex & v) :
@@ -800,7 +799,7 @@ namespace
resolved->job_lists()->pretend_job_list()->append(make_shared_ptr(new PretendJob(
changes_to_make_decision.origin_id()->uniquely_identifying_spec())));
- const std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ const std::shared_ptr<JobRequirements> requirements(new JobRequirements);
requirements->push_back(make_named_values<JobRequirement>(
n::job_number() = fetch_job_n->second,
n::required_if() = JobRequirementIfs() + jri_require_for_satisfied + jri_require_for_independent
@@ -819,7 +818,7 @@ namespace
recursed
);
- const std::tr1::shared_ptr<Sequence<PackageDepSpec> > replacing(new Sequence<PackageDepSpec>);
+ const std::shared_ptr<Sequence<PackageDepSpec> > replacing(new Sequence<PackageDepSpec>);
for (PackageIDSequence::ConstIterator i(changes_to_make_decision.destination()->replacing()->begin()),
i_end(changes_to_make_decision.destination()->replacing()->end()) ;
i != i_end ; ++i)
@@ -839,7 +838,7 @@ namespace
case nir_fetched:
{
- const std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ const std::shared_ptr<JobRequirements> requirements(new JobRequirements);
RecursedRequirements recursed;
populate_requirements(
@@ -869,13 +868,13 @@ namespace
void visit(const RemoveDecision & remove_decision) const
{
- const std::tr1::shared_ptr<Sequence<PackageDepSpec> > removing(new Sequence<PackageDepSpec>);
+ const std::shared_ptr<Sequence<PackageDepSpec> > removing(new Sequence<PackageDepSpec>);
for (PackageIDSequence::ConstIterator i(remove_decision.ids()->begin()),
i_end(remove_decision.ids()->end()) ;
i != i_end ; ++i)
removing->push_back((*i)->uniquely_identifying_spec());
- const std::tr1::shared_ptr<JobRequirements> requirements(new JobRequirements);
+ const std::shared_ptr<JobRequirements> requirements(new JobRequirements);
RecursedRequirements recursed;
populate_requirements(
resolved->nag(),
@@ -901,8 +900,8 @@ namespace
void
Orderer::_schedule(
const NAGIndex & index,
- const std::tr1::shared_ptr<const ChangeOrRemoveDecision> & d,
- const std::tr1::shared_ptr<const OrdererNotes> & n)
+ const std::shared_ptr<const ChangeOrRemoveDecision> & d,
+ const std::shared_ptr<const OrdererNotes> & n)
{
do
{
diff --git a/paludis/resolver/orderer.hh b/paludis/resolver/orderer.hh
index bbabbf8cf..356cfc594 100644
--- a/paludis/resolver/orderer.hh
+++ b/paludis/resolver/orderer.hh
@@ -32,7 +32,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/tribool-fwd.hh>
#include <paludis/environment-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -44,20 +44,20 @@ namespace paludis
private:
void _check_self_deps_and_schedule(
const NAGIndex &,
- const std::tr1::shared_ptr<const ChangeOrRemoveDecision> &,
- const std::tr1::shared_ptr<OrdererNotes> &);
+ const std::shared_ptr<const ChangeOrRemoveDecision> &,
+ const std::shared_ptr<OrdererNotes> &);
void _schedule(
const NAGIndex &,
- const std::tr1::shared_ptr<const ChangeOrRemoveDecision> &,
- const std::tr1::shared_ptr<const OrdererNotes> &);
+ const std::shared_ptr<const ChangeOrRemoveDecision> &,
+ const std::shared_ptr<const OrdererNotes> &);
void _order_sub_ssccs(
const NAG &,
const StronglyConnectedComponent & top_scc,
- const std::tr1::shared_ptr<const SortedStronglyConnectedComponents> & sub_ssccs,
+ const std::shared_ptr<const SortedStronglyConnectedComponents> & sub_ssccs,
const bool can_recurse,
- const std::tr1::function<Tribool (const NAGIndex &)> & order_early_fn);
+ const std::function<Tribool (const NAGIndex &)> & order_early_fn);
Tribool _order_early(
const NAGIndex &) const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -66,13 +66,13 @@ namespace paludis
const Resolvent & resolvent) const PALUDIS_ATTRIBUTE((warn_unused_result));
void _add_binary_cleverness(
- const std::tr1::shared_ptr<const Resolution> & resolvent);
+ const std::shared_ptr<const Resolution> & resolvent);
public:
Orderer(
const Environment * const,
const ResolverFunctions &,
- const std::tr1::shared_ptr<Resolved> &);
+ const std::shared_ptr<Resolved> &);
~Orderer();
void resolve();
diff --git a/paludis/resolver/orderer_notes.cc b/paludis/resolver/orderer_notes.cc
index f7abd4f18..077348a9d 100644
--- a/paludis/resolver/orderer_notes.cc
+++ b/paludis/resolver/orderer_notes.cc
@@ -33,7 +33,7 @@ OrdererNotes::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<OrdererNotes>
+const std::shared_ptr<OrdererNotes>
OrdererNotes::deserialise(Deserialisation & d)
{
Deserialisator v(d, "OrdererNotes");
diff --git a/paludis/resolver/orderer_notes.hh b/paludis/resolver/orderer_notes.hh
index 49685b2ef..91367b208 100644
--- a/paludis/resolver/orderer_notes.hh
+++ b/paludis/resolver/orderer_notes.hh
@@ -24,7 +24,7 @@
#include <paludis/util/attributes.hh>
#include <paludis/util/named_value.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -40,7 +40,7 @@ namespace paludis
NamedValue<n::cycle_breaking, std::string> cycle_breaking;
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<OrdererNotes> deserialise(
+ static const std::shared_ptr<OrdererNotes> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/package_or_block_dep_spec.cc b/paludis/resolver/package_or_block_dep_spec.cc
index e5c978d9a..208bf0aad 100644
--- a/paludis/resolver/package_or_block_dep_spec.cc
+++ b/paludis/resolver/package_or_block_dep_spec.cc
@@ -59,7 +59,7 @@ PackageOrBlockDepSpec::serialise(Serialiser & s) const
{
SerialiserObjectWriter w(s.object("PackageOrBlockDepSpec"));
- std::tr1::shared_ptr<DepSpec> spec;
+ std::shared_ptr<DepSpec> spec;
if (if_block())
{
spec = if_block();
@@ -107,7 +107,7 @@ PackageOrBlockDepSpec::serialise(Serialiser & s) const
}
PackageOrBlockDepSpec
-PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::tr1::shared_ptr<const PackageID> & for_id)
+PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::shared_ptr<const PackageID> & for_id)
{
Context context("When deserialising:");
@@ -124,9 +124,9 @@ PackageOrBlockDepSpec::deserialise(Deserialisation & d, const std::tr1::shared_p
vso_letters_anywhere + vso_dotted_suffixes,
for_id));
- std::tr1::shared_ptr<MetadataSectionKey> annotations;
+ std::shared_ptr<MetadataSectionKey> annotations;
- std::tr1::shared_ptr<Map<std::string, std::string> > m(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > m(new Map<std::string, std::string>);
for (int a(0), a_end(v.member<int>("annotations_count")) ;
a != a_end ; ++a)
{
diff --git a/paludis/resolver/package_or_block_dep_spec.hh b/paludis/resolver/package_or_block_dep_spec.hh
index 48a35de60..c71ba1a79 100644
--- a/paludis/resolver/package_or_block_dep_spec.hh
+++ b/paludis/resolver/package_or_block_dep_spec.hh
@@ -37,8 +37,8 @@ namespace paludis
{
struct PackageOrBlockDepSpec
{
- NamedValue<n::if_block, std::tr1::shared_ptr<BlockDepSpec> > if_block;
- NamedValue<n::if_package, std::tr1::shared_ptr<PackageDepSpec> > if_package;
+ NamedValue<n::if_block, std::shared_ptr<BlockDepSpec> > if_block;
+ NamedValue<n::if_package, std::shared_ptr<PackageDepSpec> > if_package;
PackageOrBlockDepSpec(const BlockDepSpec &);
PackageOrBlockDepSpec(const PackageDepSpec &);
@@ -47,7 +47,7 @@ namespace paludis
static PackageOrBlockDepSpec deserialise(
Deserialisation & d,
- const std::tr1::shared_ptr<const PackageID> & for_id) PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageID> & for_id) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/resolver/reason.cc b/paludis/resolver/reason.cc
index f199290f6..dd77bdc6e 100644
--- a/paludis/resolver/reason.cc
+++ b/paludis/resolver/reason.cc
@@ -74,12 +74,12 @@ namespace paludis
template <>
struct Implementation<DependencyReason>
{
- const std::tr1::shared_ptr<const PackageID> from_id;
+ const std::shared_ptr<const PackageID> from_id;
const Resolvent from_resolvent;
const SanitisedDependency dep;
const bool already_met;
- Implementation(const std::tr1::shared_ptr<const PackageID> & i,
+ Implementation(const std::shared_ptr<const PackageID> & i,
const Resolvent & r, const SanitisedDependency & d, const bool a) :
from_id(i),
from_resolvent(r),
@@ -90,7 +90,7 @@ namespace paludis
};
}
-DependencyReason::DependencyReason(const std::tr1::shared_ptr<const PackageID> & i,
+DependencyReason::DependencyReason(const std::shared_ptr<const PackageID> & i,
const Resolvent & r,
const SanitisedDependency & d,
const bool a) :
@@ -102,7 +102,7 @@ DependencyReason::~DependencyReason()
{
}
-const std::tr1::shared_ptr<const PackageID>
+const std::shared_ptr<const PackageID>
DependencyReason::from_id() const
{
return _imp->from_id;
@@ -179,16 +179,16 @@ namespace paludis
template <>
struct Implementation<WasUsedByReason>
{
- const std::tr1::shared_ptr<const ChangeByResolventSequence> ids_being_removed;
+ const std::shared_ptr<const ChangeByResolventSequence> ids_being_removed;
- Implementation(const std::tr1::shared_ptr<const ChangeByResolventSequence> & i) :
+ Implementation(const std::shared_ptr<const ChangeByResolventSequence> & i) :
ids_being_removed(i)
{
}
};
}
-WasUsedByReason::WasUsedByReason(const std::tr1::shared_ptr<const ChangeByResolventSequence> & i) :
+WasUsedByReason::WasUsedByReason(const std::shared_ptr<const ChangeByResolventSequence> & i) :
PrivateImplementationPattern<WasUsedByReason>(new Implementation<WasUsedByReason>(i))
{
}
@@ -197,7 +197,7 @@ WasUsedByReason::~WasUsedByReason()
{
}
-const std::tr1::shared_ptr<const ChangeByResolventSequence>
+const std::shared_ptr<const ChangeByResolventSequence>
WasUsedByReason::ids_and_resolvents_being_removed() const
{
return _imp->ids_being_removed;
@@ -217,9 +217,9 @@ namespace paludis
struct Implementation<PresetReason>
{
const std::string explanation;
- const std::tr1::shared_ptr<const Reason> reason_for_preset;
+ const std::shared_ptr<const Reason> reason_for_preset;
- Implementation(const std::string & m, const std::tr1::shared_ptr<const Reason> & r) :
+ Implementation(const std::string & m, const std::shared_ptr<const Reason> & r) :
explanation(m),
reason_for_preset(r)
{
@@ -227,7 +227,7 @@ namespace paludis
};
}
-PresetReason::PresetReason(const std::string & m, const std::tr1::shared_ptr<const Reason> & r) :
+PresetReason::PresetReason(const std::string & m, const std::shared_ptr<const Reason> & r) :
PrivateImplementationPattern<PresetReason>(new Implementation<PresetReason>(m, r))
{
}
@@ -236,7 +236,7 @@ PresetReason::~PresetReason()
{
}
-const std::tr1::shared_ptr<const Reason>
+const std::shared_ptr<const Reason>
PresetReason::maybe_reason_for_preset() const
{
return _imp->reason_for_preset;
@@ -263,9 +263,9 @@ namespace paludis
struct Implementation<SetReason>
{
const SetName set_name;
- const std::tr1::shared_ptr<const Reason> reason_for_set;
+ const std::shared_ptr<const Reason> reason_for_set;
- Implementation(const SetName & s, const std::tr1::shared_ptr<const Reason> & r) :
+ Implementation(const SetName & s, const std::shared_ptr<const Reason> & r) :
set_name(s),
reason_for_set(r)
{
@@ -273,7 +273,7 @@ namespace paludis
};
}
-SetReason::SetReason(const SetName & s, const std::tr1::shared_ptr<const Reason> & r) :
+SetReason::SetReason(const SetName & s, const std::shared_ptr<const Reason> & r) :
PrivateImplementationPattern<SetReason>(new Implementation<SetReason>(s, r))
{
}
@@ -288,7 +288,7 @@ SetReason::set_name() const
return _imp->set_name;
}
-const std::tr1::shared_ptr<const Reason>
+const std::shared_ptr<const Reason>
SetReason::reason_for_set() const
{
return _imp->reason_for_set;
@@ -309,9 +309,9 @@ namespace paludis
struct Implementation<LikeOtherDestinationTypeReason>
{
const Resolvent other_resolvent;
- const std::tr1::shared_ptr<const Reason> reason_for_other;
+ const std::shared_ptr<const Reason> reason_for_other;
- Implementation(const Resolvent & s, const std::tr1::shared_ptr<const Reason> & r) :
+ Implementation(const Resolvent & s, const std::shared_ptr<const Reason> & r) :
other_resolvent(s),
reason_for_other(r)
{
@@ -319,7 +319,7 @@ namespace paludis
};
}
-LikeOtherDestinationTypeReason::LikeOtherDestinationTypeReason(const Resolvent & s, const std::tr1::shared_ptr<const Reason> & r) :
+LikeOtherDestinationTypeReason::LikeOtherDestinationTypeReason(const Resolvent & s, const std::shared_ptr<const Reason> & r) :
PrivateImplementationPattern<LikeOtherDestinationTypeReason>(new Implementation<LikeOtherDestinationTypeReason>(s, r))
{
}
@@ -334,7 +334,7 @@ LikeOtherDestinationTypeReason::other_resolvent() const
return _imp->other_resolvent;
}
-const std::tr1::shared_ptr<const Reason>
+const std::shared_ptr<const Reason>
LikeOtherDestinationTypeReason::reason_for_other() const
{
return _imp->reason_for_other;
@@ -386,7 +386,7 @@ ViaBinaryReason::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<Reason>
+const std::shared_ptr<Reason>
Reason::deserialise(Deserialisation & d)
{
if (d.class_name() == "TargetReason")
@@ -399,7 +399,7 @@ Reason::deserialise(Deserialisation & d)
Deserialisator v(d, "PresetReason");
return make_shared_ptr(new PresetReason(
v.member<std::string>("maybe_explanation"),
- v.member<std::tr1::shared_ptr<Reason> >("maybe_reason_for_preset")
+ v.member<std::shared_ptr<Reason> >("maybe_reason_for_preset")
));
}
else if (d.class_name() == "SetReason")
@@ -407,13 +407,13 @@ Reason::deserialise(Deserialisation & d)
Deserialisator v(d, "SetReason");
return make_shared_ptr(new SetReason(
SetName(v.member<std::string>("set_name")),
- v.member<std::tr1::shared_ptr<Reason> >("reason_for_set")
+ v.member<std::shared_ptr<Reason> >("reason_for_set")
));
}
else if (d.class_name() == "DependencyReason")
{
Deserialisator v(d, "DependencyReason");
- const std::tr1::shared_ptr<const PackageID> from_id(v.member<std::tr1::shared_ptr<const PackageID> >("from_id"));
+ const std::shared_ptr<const PackageID> from_id(v.member<std::shared_ptr<const PackageID> >("from_id"));
return make_shared_ptr(new DependencyReason(
from_id,
v.member<Resolvent>("from_resolvent"),
@@ -432,7 +432,7 @@ Reason::deserialise(Deserialisation & d)
{
Deserialisator v(d, "WasUsedByReason");
Deserialisator vv(*v.find_remove_member("ids_and_resolvents_being_removed"), "c");
- std::tr1::shared_ptr<ChangeByResolventSequence> ids_and_resolvents_being_removed(new ChangeByResolventSequence);
+ std::shared_ptr<ChangeByResolventSequence> ids_and_resolvents_being_removed(new ChangeByResolventSequence);
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
ids_and_resolvents_being_removed->push_back(vv.member<ChangeByResolvent>(stringify(n)));
return make_shared_ptr(new WasUsedByReason(ids_and_resolvents_being_removed));
@@ -442,7 +442,7 @@ Reason::deserialise(Deserialisation & d)
Deserialisator v(d, "LikeOtherDestinationTypeReason");
return make_shared_ptr(new LikeOtherDestinationTypeReason(
v.member<Resolvent>("other_resolvent"),
- v.member<std::tr1::shared_ptr<Reason> >("reason_for_other")
+ v.member<std::shared_ptr<Reason> >("reason_for_other")
));
}
else if (d.class_name() == "ViaBinaryReason")
diff --git a/paludis/resolver/reason.hh b/paludis/resolver/reason.hh
index 2f136e486..6b3113100 100644
--- a/paludis/resolver/reason.hh
+++ b/paludis/resolver/reason.hh
@@ -30,7 +30,7 @@
#include <paludis/name-fwd.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -46,7 +46,7 @@ namespace paludis
virtual void serialise(Serialiser &) const = 0;
- static const std::tr1::shared_ptr<Reason> deserialise(
+ static const std::shared_ptr<Reason> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -71,14 +71,14 @@ namespace paludis
{
public:
DependencyReason(
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const Resolvent &,
const SanitisedDependency & s,
const bool already_met);
~DependencyReason();
- const std::tr1::shared_ptr<const PackageID> from_id() const;
+ const std::shared_ptr<const PackageID> from_id() const;
const Resolvent from_resolvent() const;
const SanitisedDependency & sanitised_dependency() const;
bool already_met() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -106,10 +106,10 @@ namespace paludis
public ImplementAcceptMethods<Reason, WasUsedByReason>
{
public:
- WasUsedByReason(const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids);
+ WasUsedByReason(const std::shared_ptr<const ChangeByResolventSequence> & ids);
~WasUsedByReason();
- const std::tr1::shared_ptr<const ChangeByResolventSequence> ids_and_resolvents_being_removed() const;
+ const std::shared_ptr<const ChangeByResolventSequence> ids_and_resolvents_being_removed() const;
virtual void serialise(Serialiser &) const;
};
@@ -122,10 +122,10 @@ namespace paludis
public:
PresetReason(
const std::string &,
- const std::tr1::shared_ptr<const Reason> &);
+ const std::shared_ptr<const Reason> &);
~PresetReason();
- const std::tr1::shared_ptr<const Reason> maybe_reason_for_preset() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Reason> maybe_reason_for_preset() const PALUDIS_ATTRIBUTE((warn_unused_result));
const std::string maybe_explanation() const PALUDIS_ATTRIBUTE((warn_unused_result));
@@ -138,11 +138,11 @@ namespace paludis
public ImplementAcceptMethods<Reason, SetReason>
{
public:
- SetReason(const SetName &, const std::tr1::shared_ptr<const Reason> &);
+ SetReason(const SetName &, const std::shared_ptr<const Reason> &);
~SetReason();
const SetName set_name() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Reason> reason_for_set() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Reason> reason_for_set() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
@@ -153,11 +153,11 @@ namespace paludis
public ImplementAcceptMethods<Reason, LikeOtherDestinationTypeReason>
{
public:
- LikeOtherDestinationTypeReason(const Resolvent &, const std::tr1::shared_ptr<const Reason> &);
+ LikeOtherDestinationTypeReason(const Resolvent &, const std::shared_ptr<const Reason> &);
~LikeOtherDestinationTypeReason();
const Resolvent other_resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Reason> reason_for_other() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Reason> reason_for_other() const PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
};
diff --git a/paludis/resolver/required_confirmations-fwd.hh b/paludis/resolver/required_confirmations-fwd.hh
index 169df4919..ddd9398af 100644
--- a/paludis/resolver/required_confirmations-fwd.hh
+++ b/paludis/resolver/required_confirmations-fwd.hh
@@ -21,7 +21,7 @@
#define PALUDIS_GUARD_PALUDIS_RESOLVER_REQUIRED_CONFIRMATIONS_FWD_HH 1
#include <paludis/util/sequence-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -33,7 +33,7 @@ namespace paludis
struct BreakConfirmation;
struct RemoveSystemPackageConfirmation;
- typedef Sequence<std::tr1::shared_ptr<const RequiredConfirmation> > RequiredConfirmations;
+ typedef Sequence<std::shared_ptr<const RequiredConfirmation> > RequiredConfirmations;
}
}
diff --git a/paludis/resolver/required_confirmations.cc b/paludis/resolver/required_confirmations.cc
index 62a654aa4..49d6becc1 100644
--- a/paludis/resolver/required_confirmations.cc
+++ b/paludis/resolver/required_confirmations.cc
@@ -25,10 +25,10 @@
using namespace paludis;
using namespace paludis::resolver;
-const std::tr1::shared_ptr<RequiredConfirmation>
+const std::shared_ptr<RequiredConfirmation>
RequiredConfirmation::deserialise(Deserialisation & d)
{
- std::tr1::shared_ptr<RequiredConfirmation> result;
+ std::shared_ptr<RequiredConfirmation> result;
if (d.class_name() == "DowngradeConfirmation")
return DowngradeConfirmation::deserialise(d);
@@ -44,7 +44,7 @@ RequiredConfirmation::deserialise(Deserialisation & d)
return result;
}
-const std::tr1::shared_ptr<DowngradeConfirmation>
+const std::shared_ptr<DowngradeConfirmation>
DowngradeConfirmation::deserialise(Deserialisation & d)
{
Deserialisator v(d, "DowngradeConfirmation");
@@ -58,7 +58,7 @@ DowngradeConfirmation::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<NotBestConfirmation>
+const std::shared_ptr<NotBestConfirmation>
NotBestConfirmation::deserialise(Deserialisation & d)
{
Deserialisator v(d, "NotBestConfirmation");
@@ -72,7 +72,7 @@ NotBestConfirmation::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<BreakConfirmation>
+const std::shared_ptr<BreakConfirmation>
BreakConfirmation::deserialise(Deserialisation & d)
{
Deserialisator v(d, "BreakConfirmation");
@@ -86,7 +86,7 @@ BreakConfirmation::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<RemoveSystemPackageConfirmation>
+const std::shared_ptr<RemoveSystemPackageConfirmation>
RemoveSystemPackageConfirmation::deserialise(Deserialisation & d)
{
Deserialisator v(d, "RemoveSystemPackageConfirmation");
@@ -100,6 +100,6 @@ RemoveSystemPackageConfirmation::serialise(Serialiser & s) const
;
}
-template class Sequence<std::tr1::shared_ptr<const RequiredConfirmation> >;
-template class WrappedForwardIterator<RequiredConfirmations::ConstIteratorTag, const std::tr1::shared_ptr<const RequiredConfirmation> >;
+template class Sequence<std::shared_ptr<const RequiredConfirmation> >;
+template class WrappedForwardIterator<RequiredConfirmations::ConstIteratorTag, const std::shared_ptr<const RequiredConfirmation> >;
diff --git a/paludis/resolver/required_confirmations.hh b/paludis/resolver/required_confirmations.hh
index 825e7f22e..2c7e1c8ec 100644
--- a/paludis/resolver/required_confirmations.hh
+++ b/paludis/resolver/required_confirmations.hh
@@ -37,7 +37,7 @@ namespace paludis
public:
virtual void serialise(Serialiser &) const = 0;
- static const std::tr1::shared_ptr<RequiredConfirmation> deserialise(
+ static const std::shared_ptr<RequiredConfirmation> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
@@ -46,7 +46,7 @@ namespace paludis
public ImplementAcceptMethods<RequiredConfirmation, DowngradeConfirmation>
{
public:
- static const std::tr1::shared_ptr<DowngradeConfirmation> deserialise(
+ static const std::shared_ptr<DowngradeConfirmation> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
@@ -57,7 +57,7 @@ namespace paludis
public ImplementAcceptMethods<RequiredConfirmation, NotBestConfirmation>
{
public:
- static const std::tr1::shared_ptr<NotBestConfirmation> deserialise(
+ static const std::shared_ptr<NotBestConfirmation> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
@@ -68,7 +68,7 @@ namespace paludis
public ImplementAcceptMethods<RequiredConfirmation, BreakConfirmation>
{
public:
- static const std::tr1::shared_ptr<BreakConfirmation> deserialise(
+ static const std::shared_ptr<BreakConfirmation> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
@@ -79,7 +79,7 @@ namespace paludis
public ImplementAcceptMethods<RequiredConfirmation, RemoveSystemPackageConfirmation>
{
public:
- static const std::tr1::shared_ptr<RemoveSystemPackageConfirmation> deserialise(
+ static const std::shared_ptr<RemoveSystemPackageConfirmation> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
virtual void serialise(Serialiser &) const;
diff --git a/paludis/resolver/resolution.cc b/paludis/resolver/resolution.cc
index ec398a310..c70acc83c 100644
--- a/paludis/resolver/resolution.cc
+++ b/paludis/resolver/resolution.cc
@@ -42,14 +42,14 @@ Resolution::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<Resolution>
+const std::shared_ptr<Resolution>
Resolution::deserialise(Deserialisation & d)
{
Deserialisator v(d, "Resolution");
return make_shared_ptr(new Resolution(make_named_values<Resolution>(
- n::constraints() = v.member<std::tr1::shared_ptr<Constraints> >("constraints"),
- n::decision() = v.member<std::tr1::shared_ptr<Decision> >("decision"),
+ n::constraints() = v.member<std::shared_ptr<Constraints> >("constraints"),
+ n::decision() = v.member<std::shared_ptr<Decision> >("decision"),
n::resolvent() = v.member<Resolvent>("resolvent")
)));
}
diff --git a/paludis/resolver/resolution.hh b/paludis/resolver/resolution.hh
index 82e27771c..87a16d2e1 100644
--- a/paludis/resolver/resolution.hh
+++ b/paludis/resolver/resolution.hh
@@ -25,7 +25,7 @@
#include <paludis/resolver/decision-fwd.hh>
#include <paludis/resolver/resolvent.hh>
#include <paludis/util/named_value.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -40,13 +40,13 @@ namespace paludis
{
struct Resolution
{
- NamedValue<n::constraints, std::tr1::shared_ptr<Constraints> > constraints;
- NamedValue<n::decision, std::tr1::shared_ptr<Decision> > decision;
+ NamedValue<n::constraints, std::shared_ptr<Constraints> > constraints;
+ NamedValue<n::decision, std::shared_ptr<Decision> > decision;
NamedValue<n::resolvent, Resolvent> resolvent;
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<Resolution> deserialise(
+ static const std::shared_ptr<Resolution> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/resolutions_by_resolvent.cc b/paludis/resolver/resolutions_by_resolvent.cc
index af8d118d4..f89054962 100644
--- a/paludis/resolver/resolutions_by_resolvent.cc
+++ b/paludis/resolver/resolutions_by_resolvent.cc
@@ -27,15 +27,15 @@
#include <paludis/util/stringify.hh>
#include <paludis/serialise-impl.hh>
#include <list>
-#include <tr1/unordered_map>
+#include <unordered_map>
using namespace paludis;
using namespace paludis::resolver;
// we need iterators to remain valid after an insert, but we also need fast
// lookups.
-typedef std::list<std::tr1::shared_ptr<Resolution> > ResolutionList;
-typedef std::tr1::unordered_map<Resolvent, ResolutionList::const_iterator, Hash<Resolvent> > ResolutionListIndex;
+typedef std::list<std::shared_ptr<Resolution> > ResolutionList;
+typedef std::unordered_map<Resolvent, ResolutionList::const_iterator, Hash<Resolvent> > ResolutionListIndex;
namespace paludis
{
@@ -49,7 +49,7 @@ namespace paludis
template <>
struct WrappedForwardIteratorTraits<ResolutionsByResolvent::ConstIteratorTag>
{
- typedef std::list<std::tr1::shared_ptr<Resolution> >::const_iterator UnderlyingIterator;
+ typedef std::list<std::shared_ptr<Resolution> >::const_iterator UnderlyingIterator;
};
}
@@ -85,7 +85,7 @@ ResolutionsByResolvent::find(const Resolvent & r) const
}
ResolutionsByResolvent::ConstIterator
-ResolutionsByResolvent::insert_new(const std::tr1::shared_ptr<Resolution> & r)
+ResolutionsByResolvent::insert_new(const std::shared_ptr<Resolution> & r)
{
ResolutionList::iterator i(_imp->resolution_list.insert(_imp->resolution_list.end(), r));
if (! _imp->resolution_list_index.insert(std::make_pair(r->resolvent(), i)).second)
@@ -104,16 +104,16 @@ ResolutionsByResolvent::serialise(Serialiser & s) const
;
}
-const std::tr1::shared_ptr<ResolutionsByResolvent>
+const std::shared_ptr<ResolutionsByResolvent>
ResolutionsByResolvent::deserialise(Deserialisation & d)
{
Deserialisator v(d, "ResolutionsByResolvent");
Deserialisator vv(*v.find_remove_member("items"), "c");
- std::tr1::shared_ptr<ResolutionsByResolvent> result(new ResolutionsByResolvent);
+ std::shared_ptr<ResolutionsByResolvent> result(new ResolutionsByResolvent);
for (int n(1), n_end(vv.member<int>("count") + 1) ; n != n_end ; ++n)
- result->insert_new(vv.member<std::tr1::shared_ptr<Resolution> >(stringify(n)));
+ result->insert_new(vv.member<std::shared_ptr<Resolution> >(stringify(n)));
return result;
}
-template class WrappedForwardIterator<ResolutionsByResolvent::ConstIteratorTag, const std::tr1::shared_ptr<Resolution> >;
+template class WrappedForwardIterator<ResolutionsByResolvent::ConstIteratorTag, const std::shared_ptr<Resolution> >;
diff --git a/paludis/resolver/resolutions_by_resolvent.hh b/paludis/resolver/resolutions_by_resolvent.hh
index 98f4b2634..210a7564f 100644
--- a/paludis/resolver/resolutions_by_resolvent.hh
+++ b/paludis/resolver/resolutions_by_resolvent.hh
@@ -26,7 +26,7 @@
#include <paludis/util/private_implementation_pattern.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -40,22 +40,22 @@ namespace paludis
~ResolutionsByResolvent();
struct ConstIteratorTag;
- typedef WrappedForwardIterator<ConstIteratorTag, const std::tr1::shared_ptr<Resolution> > ConstIterator;
+ typedef WrappedForwardIterator<ConstIteratorTag, const std::shared_ptr<Resolution> > ConstIterator;
ConstIterator begin() const PALUDIS_ATTRIBUTE((warn_unused_result));
ConstIterator end() const PALUDIS_ATTRIBUTE((warn_unused_result));
ConstIterator find(const Resolvent &) const PALUDIS_ATTRIBUTE((warn_unused_result));
- ConstIterator insert_new(const std::tr1::shared_ptr<Resolution> &);
+ ConstIterator insert_new(const std::shared_ptr<Resolution> &);
void serialise(Serialiser &) const;
- static const std::tr1::shared_ptr<ResolutionsByResolvent> deserialise(
+ static const std::shared_ptr<ResolutionsByResolvent> deserialise(
Deserialisation & d) PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
extern template class WrappedForwardIterator<resolver::ResolutionsByResolvent::ConstIteratorTag,
- const std::tr1::shared_ptr<resolver::Resolution> >;
+ const std::shared_ptr<resolver::Resolution> >;
}
#endif
diff --git a/paludis/resolver/resolved.cc b/paludis/resolver/resolved.cc
index 80e515287..631de3095 100644
--- a/paludis/resolver/resolved.cc
+++ b/paludis/resolver/resolved.cc
@@ -52,23 +52,23 @@ Resolved::deserialise(Deserialisation & d)
return make_named_values<Resolved>(
n::job_lists() =
- v.member<std::tr1::shared_ptr<JobLists> >("job_lists"),
+ v.member<std::shared_ptr<JobLists> >("job_lists"),
n::nag() =
- v.member<std::tr1::shared_ptr<NAG> >("nag"),
+ v.member<std::shared_ptr<NAG> >("nag"),
n::resolutions_by_resolvent() =
- v.member<std::tr1::shared_ptr<ResolutionsByResolvent> >("resolutions_by_resolvent"),
+ v.member<std::shared_ptr<ResolutionsByResolvent> >("resolutions_by_resolvent"),
n::taken_change_or_remove_decisions() =
- v.member<std::tr1::shared_ptr<OrderedChangeOrRemoveDecisions> >("taken_change_or_remove_decisions"),
+ v.member<std::shared_ptr<OrderedChangeOrRemoveDecisions> >("taken_change_or_remove_decisions"),
n::taken_unable_to_make_decisions() =
- v.member<std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > >("taken_unable_to_make_decisions"),
+ v.member<std::shared_ptr<Decisions<UnableToMakeDecision> > >("taken_unable_to_make_decisions"),
n::taken_unconfirmed_decisions() =
- v.member<std::tr1::shared_ptr<Decisions<ConfirmableDecision> > >("taken_unconfirmed_decisions"),
+ v.member<std::shared_ptr<Decisions<ConfirmableDecision> > >("taken_unconfirmed_decisions"),
n::taken_unorderable_decisions() =
- v.member<std::tr1::shared_ptr<OrderedChangeOrRemoveDecisions> >("taken_unorderable_decisions"),
+ v.member<std::shared_ptr<OrderedChangeOrRemoveDecisions> >("taken_unorderable_decisions"),
n::untaken_change_or_remove_decisions() =
- v.member<std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > >("untaken_change_or_remove_decisions"),
+ v.member<std::shared_ptr<Decisions<ChangeOrRemoveDecision> > >("untaken_change_or_remove_decisions"),
n::untaken_unable_to_make_decisions() =
- v.member<std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > >("untaken_unable_to_make_decisions")
+ v.member<std::shared_ptr<Decisions<UnableToMakeDecision> > >("untaken_unable_to_make_decisions")
);
}
diff --git a/paludis/resolver/resolved.hh b/paludis/resolver/resolved.hh
index fda8c44cd..ac523d068 100644
--- a/paludis/resolver/resolved.hh
+++ b/paludis/resolver/resolved.hh
@@ -28,7 +28,7 @@
#include <paludis/resolver/nag-fwd.hh>
#include <paludis/util/named_value.hh>
#include <paludis/serialise-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -49,15 +49,15 @@ namespace paludis
{
struct Resolved
{
- NamedValue<n::job_lists, std::tr1::shared_ptr<JobLists> > job_lists;
- NamedValue<n::nag, std::tr1::shared_ptr<NAG> > nag;
- NamedValue<n::resolutions_by_resolvent, std::tr1::shared_ptr<ResolutionsByResolvent> > resolutions_by_resolvent;
- NamedValue<n::taken_change_or_remove_decisions, std::tr1::shared_ptr<OrderedChangeOrRemoveDecisions> > taken_change_or_remove_decisions;
- NamedValue<n::taken_unable_to_make_decisions, std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > > taken_unable_to_make_decisions;
- NamedValue<n::taken_unconfirmed_decisions, std::tr1::shared_ptr<Decisions<ConfirmableDecision> > > taken_unconfirmed_decisions;
- NamedValue<n::taken_unorderable_decisions, std::tr1::shared_ptr<OrderedChangeOrRemoveDecisions> > taken_unorderable_decisions;
- NamedValue<n::untaken_change_or_remove_decisions, std::tr1::shared_ptr<Decisions<ChangeOrRemoveDecision> > > untaken_change_or_remove_decisions;
- NamedValue<n::untaken_unable_to_make_decisions, std::tr1::shared_ptr<Decisions<UnableToMakeDecision> > > untaken_unable_to_make_decisions;
+ NamedValue<n::job_lists, std::shared_ptr<JobLists> > job_lists;
+ NamedValue<n::nag, std::shared_ptr<NAG> > nag;
+ NamedValue<n::resolutions_by_resolvent, std::shared_ptr<ResolutionsByResolvent> > resolutions_by_resolvent;
+ NamedValue<n::taken_change_or_remove_decisions, std::shared_ptr<OrderedChangeOrRemoveDecisions> > taken_change_or_remove_decisions;
+ NamedValue<n::taken_unable_to_make_decisions, std::shared_ptr<Decisions<UnableToMakeDecision> > > taken_unable_to_make_decisions;
+ NamedValue<n::taken_unconfirmed_decisions, std::shared_ptr<Decisions<ConfirmableDecision> > > taken_unconfirmed_decisions;
+ NamedValue<n::taken_unorderable_decisions, std::shared_ptr<OrderedChangeOrRemoveDecisions> > taken_unorderable_decisions;
+ NamedValue<n::untaken_change_or_remove_decisions, std::shared_ptr<Decisions<ChangeOrRemoveDecision> > > untaken_change_or_remove_decisions;
+ NamedValue<n::untaken_unable_to_make_decisions, std::shared_ptr<Decisions<UnableToMakeDecision> > > untaken_unable_to_make_decisions;
static const Resolved deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;
diff --git a/paludis/resolver/resolvent.cc b/paludis/resolver/resolvent.cc
index 1491d5f87..a8eda415e 100644
--- a/paludis/resolver/resolvent.cc
+++ b/paludis/resolver/resolvent.cc
@@ -127,7 +127,7 @@ Resolvent::Resolvent(
}
Resolvent::Resolvent(
- const std::tr1::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const PackageID> & id,
const DestinationType t) :
destination_type(n::destination_type() = t),
package(id->name()),
diff --git a/paludis/resolver/resolvent.hh b/paludis/resolver/resolvent.hh
index 1c986203f..da86f1c3e 100644
--- a/paludis/resolver/resolvent.hh
+++ b/paludis/resolver/resolvent.hh
@@ -22,7 +22,6 @@
#include <paludis/resolver/resolvent-fwd.hh>
#include <paludis/resolver/destination_types-fwd.hh>
-#include <paludis/resolver/destination_types-fwd.hh>
#include <paludis/resolver/slot_name_or_null.hh>
#include <paludis/util/named_value.hh>
#include <paludis/util/sequence.hh>
@@ -31,7 +30,7 @@
#include <paludis/dep_spec-fwd.hh>
#include <paludis/package_id-fwd.hh>
#include <paludis/name.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -58,7 +57,7 @@ namespace paludis
Resolvent(const PackageDepSpec &, const bool, const DestinationType);
Resolvent(const PackageDepSpec &, const SlotName &, const DestinationType);
- Resolvent(const std::tr1::shared_ptr<const PackageID> &, const DestinationType);
+ Resolvent(const std::shared_ptr<const PackageID> &, const DestinationType);
void serialise(Serialiser &) const;
static const Resolvent deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
diff --git a/paludis/resolver/resolver.cc b/paludis/resolver/resolver.cc
index fded12653..3da23c665 100644
--- a/paludis/resolver/resolver.cc
+++ b/paludis/resolver/resolver.cc
@@ -55,10 +55,10 @@ namespace paludis
const Environment * const env;
const ResolverFunctions fns;
- const std::tr1::shared_ptr<Resolved> resolved;
+ const std::shared_ptr<Resolved> resolved;
- const std::tr1::shared_ptr<Decider> decider;
- const std::tr1::shared_ptr<Orderer> orderer;
+ const std::shared_ptr<Decider> decider;
+ const std::shared_ptr<Orderer> orderer;
Implementation(const Environment * const e, const ResolverFunctions & f) :
env(e),
@@ -106,13 +106,13 @@ namespace
struct SetExpander
{
const Environment * const env;
- const std::tr1::shared_ptr<Decider> & decider;
- const std::tr1::shared_ptr<const Reason> reason;
+ const std::shared_ptr<Decider> & decider;
+ const std::shared_ptr<const Reason> reason;
RecursingNames & recurse;
SetExpander(const Environment * const e,
- const std::tr1::shared_ptr<Decider> & d,
- const std::tr1::shared_ptr<const Reason> & r,
+ const std::shared_ptr<Decider> & d,
+ const std::shared_ptr<const Reason> & r,
RecursingNames & c) :
env(e),
decider(d),
@@ -126,7 +126,7 @@ namespace
if (! recurse.insert(n.spec()->name()).second)
throw RecursivelyDefinedSetError(stringify(n.spec()->name()));
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(n.spec()->name()));
+ const std::shared_ptr<const SetSpecTree> set(env->set(n.spec()->name()));
if (! set)
throw NoSuchSetError(stringify(n.spec()->name()));
@@ -154,7 +154,7 @@ Resolver::add_target(const SetName & set_name, const std::string & extra_informa
Context context("When adding set target '" + stringify(set_name) + "':");
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStepEvent());
- const std::tr1::shared_ptr<const SetSpecTree> set(_imp->env->set(set_name));
+ const std::shared_ptr<const SetSpecTree> set(_imp->env->set(set_name));
if (! set)
throw NoSuchSetError(stringify(set_name));
@@ -176,7 +176,7 @@ Resolver::resolve()
_imp->env->trigger_notifier_callback(NotifierCallbackResolverStageEvent("Done"));
}
-const std::tr1::shared_ptr<const Resolved>
+const std::shared_ptr<const Resolved>
Resolver::resolved() const
{
return _imp->resolved;
diff --git a/paludis/resolver/resolver.hh b/paludis/resolver/resolver.hh
index 0515a17ec..5cc8e64fd 100644
--- a/paludis/resolver/resolver.hh
+++ b/paludis/resolver/resolver.hh
@@ -36,7 +36,7 @@
#include <paludis/spec_tree-fwd.hh>
#include <paludis/filtered_generator-fwd.hh>
#include <paludis/generator-fwd.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -57,7 +57,7 @@ namespace paludis
void resolve();
- const std::tr1::shared_ptr<const Resolved> resolved() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Resolved> resolved() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
}
diff --git a/paludis/resolver/resolver_TEST_any.cc b/paludis/resolver/resolver_TEST_any.cc
index ccba732fe..6782af8c3 100644
--- a/paludis/resolver/resolver_TEST_any.cc
+++ b/paludis/resolver/resolver_TEST_any.cc
@@ -45,7 +45,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -73,7 +73,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -103,7 +103,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -134,7 +134,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("test/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -171,9 +171,9 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("preferences/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("preferences/target"));
- std::tr1::shared_ptr<DecisionChecks> checks;
+ std::shared_ptr<DecisionChecks> checks;
if (a.is_true())
{
diff --git a/paludis/resolver/resolver_TEST_blockers.cc b/paludis/resolver/resolver_TEST_blockers.cc
index 90ab1a301..11167cbf1 100644
--- a/paludis/resolver/resolver_TEST_blockers.cc
+++ b/paludis/resolver/resolver_TEST_blockers.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -79,7 +79,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("hard/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("hard/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("hard/a-pkg"))
@@ -113,7 +113,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unfixable/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("unfixable/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("unfixable/target"))
@@ -149,7 +149,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("remove/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("remove/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.remove(QualifiedPackageName("remove/a-pkg"))
@@ -186,7 +186,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
+ std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!target/target",
parse_user_package_dep_spec("target/target", &env, UserPackageDepSpecOptions()),
false)));
@@ -231,7 +231,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("blocked-and-dep/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("blocked-and-dep/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -265,7 +265,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("block-and-dep-cycle/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("block-and-dep-cycle/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -296,7 +296,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("hard-block-and-dep-cycle/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("hard-block-and-dep-cycle/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -342,8 +342,8 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved(cat + "/target"));
- std::tr1::shared_ptr<DecisionChecks> checks, u_checks, o_checks;
+ std::shared_ptr<const Resolved> resolved(get_resolved(cat + "/target"));
+ std::shared_ptr<DecisionChecks> checks, u_checks, o_checks;
if (dep_version != 0)
{
diff --git a/paludis/resolver/resolver_TEST_continue_on_failure.cc b/paludis/resolver/resolver_TEST_continue_on_failure.cc
index 7daedf264..8465ecb95 100644
--- a/paludis/resolver/resolver_TEST_continue_on_failure.cc
+++ b/paludis/resolver/resolver_TEST_continue_on_failure.cc
@@ -49,7 +49,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -70,9 +70,9 @@ namespace
UseExisting
use_existing_if_same(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const Reason> &)
{
return ue_if_same;
}
@@ -110,14 +110,14 @@ namespace test_cases
virtual ResolverFunctions get_resolver_functions(InitialConstraints & initial_constraints)
{
ResolverFunctions result(ResolverContinueOnFailureTestCase::get_resolver_functions(initial_constraints));
- result.get_use_existing_fn() = std::tr1::bind(&use_existing_if_same, std::tr1::placeholders::_1,
- std::tr1::placeholders::_2, std::tr1::placeholders::_3);
+ result.get_use_existing_fn() = std::bind(&use_existing_if_same, std::placeholders::_1,
+ std::placeholders::_2, std::placeholders::_3);
return result;
}
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("continue-on-failure/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("continue-on-failure/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -183,7 +183,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
+ std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!continue-on-failure-uninstall/target",
parse_user_package_dep_spec("continue-on-failure-uninstall/target", &env, UserPackageDepSpecOptions()),
false)));
diff --git a/paludis/resolver/resolver_TEST_cycles.cc b/paludis/resolver/resolver_TEST_cycles.cc
index 3383abbe5..b736a1731 100644
--- a/paludis/resolver/resolver_TEST_cycles.cc
+++ b/paludis/resolver/resolver_TEST_cycles.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_same(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const Reason> &)
{
return ue_if_same;
}
@@ -86,14 +86,14 @@ namespace test_cases
virtual ResolverFunctions get_resolver_functions(InitialConstraints & initial_constraints)
{
ResolverFunctions result(ResolverCyclesTestCase::get_resolver_functions(initial_constraints));
- result.get_use_existing_fn() = std::tr1::bind(&use_existing_if_same, std::tr1::placeholders::_1,
- std::tr1::placeholders::_2, std::tr1::placeholders::_3);
+ result.get_use_existing_fn() = std::bind(&use_existing_if_same, std::placeholders::_1,
+ std::placeholders::_2, std::placeholders::_3);
return result;
}
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("no-changes/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("no-changes/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -123,7 +123,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("existing-usable/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("existing-usable/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -150,7 +150,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("mutual-run-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("mutual-run-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -179,7 +179,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("mutual-build-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("mutual-build-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -220,8 +220,8 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("triangle/target"));
- std::tr1::shared_ptr<DecisionChecks> checks, u_checks;
+ std::shared_ptr<const Resolved> resolved(get_resolved("triangle/target"));
+ std::shared_ptr<DecisionChecks> checks, u_checks;
if (b_installed)
{
@@ -291,15 +291,15 @@ namespace test_cases
virtual ResolverFunctions get_resolver_functions(InitialConstraints & initial_constraints)
{
ResolverFunctions result(ResolverCyclesTestCase::get_resolver_functions(initial_constraints));
- result.get_use_existing_fn() = std::tr1::bind(&use_existing_if_same, std::tr1::placeholders::_1,
- std::tr1::placeholders::_2, std::tr1::placeholders::_3);
+ result.get_use_existing_fn() = std::bind(&use_existing_if_same, std::placeholders::_1,
+ std::placeholders::_2, std::placeholders::_3);
return result;
}
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved(cat + "/target"));
- std::tr1::shared_ptr<DecisionChecks> checks, u_checks;
+ std::shared_ptr<const Resolved> resolved(get_resolved(cat + "/target"));
+ std::shared_ptr<DecisionChecks> checks, u_checks;
if (runtime || installed_version == 1)
{
diff --git a/paludis/resolver/resolver_TEST_errors.cc b/paludis/resolver/resolver_TEST_errors.cc
index abc8a74c2..acfd5f00f 100644
--- a/paludis/resolver/resolver_TEST_errors.cc
+++ b/paludis/resolver/resolver_TEST_errors.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -71,7 +71,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unable-to-decide-then-more/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("unable-to-decide-then-more/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_TEST_fetches.cc b/paludis/resolver/resolver_TEST_fetches.cc
index cbc4563a4..ba647f2a1 100644
--- a/paludis/resolver/resolver_TEST_fetches.cc
+++ b/paludis/resolver/resolver_TEST_fetches.cc
@@ -49,7 +49,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -91,7 +91,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("fetch/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("fetch/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
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"))
diff --git a/paludis/resolver/resolver_TEST_serialisation.cc b/paludis/resolver/resolver_TEST_serialisation.cc
index de702c9ab..7b918aed0 100644
--- a/paludis/resolver/resolver_TEST_serialisation.cc
+++ b/paludis/resolver/resolver_TEST_serialisation.cc
@@ -45,7 +45,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -73,9 +73,9 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved;
+ std::shared_ptr<const Resolved> resolved;
{
- std::tr1::shared_ptr<const Resolved> orig_resolved(get_resolved("serialisation/target"));
+ std::shared_ptr<const Resolved> orig_resolved(get_resolved("serialisation/target"));
StringListStream str;
Serialiser ser(str);
orig_resolved->serialise(ser);
diff --git a/paludis/resolver/resolver_TEST_simple.cc b/paludis/resolver/resolver_TEST_simple.cc
index ad29f1602..c707821e4 100644
--- a/paludis/resolver/resolver_TEST_simple.cc
+++ b/paludis/resolver/resolver_TEST_simple.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -71,7 +71,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("no-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("no-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
.change(QualifiedPackageName("no-deps/target"))
@@ -96,7 +96,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("build-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("build-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -125,7 +125,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("run-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("run-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -154,7 +154,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("post-deps/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("post-deps/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_TEST_suggestions.cc b/paludis/resolver/resolver_TEST_suggestions.cc
index 1c6dadef7..aa325638a 100644
--- a/paludis/resolver/resolver_TEST_suggestions.cc
+++ b/paludis/resolver/resolver_TEST_suggestions.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -71,7 +71,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("suggestion/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("suggestion/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -98,7 +98,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("unmeetable-suggestion/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("unmeetable-suggestion/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -125,7 +125,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("suggestion-then-dependency/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("suggestion-then-dependency/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_TEST_uninstalls.cc b/paludis/resolver/resolver_TEST_uninstalls.cc
index 1f71c86c3..d2338ace3 100644
--- a/paludis/resolver/resolver_TEST_uninstalls.cc
+++ b/paludis/resolver/resolver_TEST_uninstalls.cc
@@ -46,7 +46,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -92,13 +92,13 @@ namespace test_cases
virtual ResolverFunctions get_resolver_functions(InitialConstraints & initial_constraints)
{
ResolverFunctions result(ResolverUninstallsTestCase::get_resolver_functions(initial_constraints));
- result.confirm_fn() = std::tr1::bind(return_literal_function(confirm));
+ result.confirm_fn() = std::bind(return_literal_function(confirm));
return result;
}
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
+ std::shared_ptr<const Resolved> resolved(get_resolved(BlockDepSpec(
"!breaking/target",
parse_user_package_dep_spec("breaking/target", &env, UserPackageDepSpecOptions()),
false)));
diff --git a/paludis/resolver/resolver_TEST_virtuals.cc b/paludis/resolver/resolver_TEST_virtuals.cc
index 7de773128..a4905f36d 100644
--- a/paludis/resolver/resolver_TEST_virtuals.cc
+++ b/paludis/resolver/resolver_TEST_virtuals.cc
@@ -43,7 +43,7 @@
#include <test/test_framework.hh>
#include <list>
-#include <tr1/functional>
+#include <functional>
#include <algorithm>
#include <map>
@@ -71,7 +71,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("virtuals/target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("virtuals/target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
@@ -98,7 +98,7 @@ namespace test_cases
void run()
{
- std::tr1::shared_ptr<const Resolved> resolved(get_resolved("virtual/virtual-target"));
+ std::shared_ptr<const Resolved> resolved(get_resolved("virtual/virtual-target"));
check_resolved(resolved,
n::taken_change_or_remove_decisions() = make_shared_copy(DecisionChecks()
diff --git a/paludis/resolver/resolver_functions.hh b/paludis/resolver/resolver_functions.hh
index 0eee78f94..dd59d182a 100644
--- a/paludis/resolver/resolver_functions.hh
+++ b/paludis/resolver/resolver_functions.hh
@@ -40,7 +40,7 @@
#include <paludis/dep_spec-fwd.hh>
#include <paludis/generator-fwd.hh>
#include <paludis/filtered_generator-fwd.hh>
-#include <tr1/functional>
+#include <functional>
namespace paludis
{
@@ -68,93 +68,93 @@ namespace paludis
namespace resolver
{
- typedef std::tr1::function<bool (
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &
+ typedef std::function<bool (
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &
)> AllowedToRemoveFunction;
- typedef std::tr1::function<bool (
- const std::tr1::shared_ptr<const Resolution> &
+ typedef std::function<bool (
+ const std::shared_ptr<const Resolution> &
)> AlwaysViaBinaryFunction;
- typedef std::tr1::function<bool (
- const std::tr1::shared_ptr<const PackageID> &
+ typedef std::function<bool (
+ const std::shared_ptr<const PackageID> &
)> CanUseFunction;
- typedef std::tr1::function<bool (
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const RequiredConfirmation> &
+ typedef std::function<bool (
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const RequiredConfirmation> &
)> ConfirmFunction;
- typedef std::tr1::function<const std::tr1::shared_ptr<const Repository> (
- const std::tr1::shared_ptr<const Resolution> &,
+ typedef std::function<const std::shared_ptr<const Repository> (
+ const std::shared_ptr<const Resolution> &,
const ChangesToMakeDecision &
)> FindRepositoryForFunction;
- typedef std::tr1::function<std::tr1::shared_ptr<ConstraintSequence> (
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &
+ typedef std::function<std::shared_ptr<ConstraintSequence> (
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &
)> GetConstraintsForDependentFunction;
- typedef std::tr1::function<std::tr1::shared_ptr<ConstraintSequence> (
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> &
+ typedef std::function<std::shared_ptr<ConstraintSequence> (
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const ChangeByResolventSequence> &
)> GetConstraintsForPurgeFunction;
- typedef std::tr1::function<std::tr1::shared_ptr<ConstraintSequence> (
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const Resolution> &
+ typedef std::function<std::shared_ptr<ConstraintSequence> (
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &
)> GetConstraintsForViaBinaryFunction;
- typedef std::tr1::function<DestinationTypes (
+ typedef std::function<DestinationTypes (
const PackageDepSpec &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const Reason> &
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Reason> &
)> GetDestinationTypesForFunction;
- typedef std::tr1::function<std::tr1::shared_ptr<Constraints> (
+ typedef std::function<std::shared_ptr<Constraints> (
const Resolvent &
)> GetInitialConstraintsFunction;
- typedef std::tr1::function<std::tr1::shared_ptr<Resolvents> (
+ typedef std::function<std::shared_ptr<Resolvents> (
const PackageDepSpec &,
- const std::tr1::shared_ptr<const SlotName> &,
- const std::tr1::shared_ptr<const Reason> &
+ const std::shared_ptr<const SlotName> &,
+ const std::shared_ptr<const Reason> &
)> GetResolventsForFunction;
- typedef std::tr1::function<UseExisting (
- const std::tr1::shared_ptr<const Resolution> &,
+ typedef std::function<UseExisting (
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const Reason> &
+ const std::shared_ptr<const Reason> &
)> GetUseExistingFunction;
- typedef std::tr1::function<SpecInterest (
- const std::tr1::shared_ptr<const Resolution> &,
+ typedef std::function<SpecInterest (
+ const std::shared_ptr<const Resolution> &,
const SanitisedDependency &
)> InterestInSpecFunction;
- typedef std::tr1::function<FilteredGenerator (
+ typedef std::function<FilteredGenerator (
const Generator &,
- const std::tr1::shared_ptr<const Resolution> &
+ const std::shared_ptr<const Resolution> &
)> MakeDestinationFilteredGeneratorFunction;
- typedef std::tr1::function<FilteredGenerator (
+ typedef std::function<FilteredGenerator (
const Generator &,
- const std::tr1::shared_ptr<const Resolution> &
+ const std::shared_ptr<const Resolution> &
)> MakeOriginFilteredGeneratorFunction;
- typedef std::tr1::function<Tribool (
- const std::tr1::shared_ptr<const Resolution> &
+ typedef std::function<Tribool (
+ const std::shared_ptr<const Resolution> &
)> OrderEarlyFunction;
- typedef std::tr1::function<Tribool (
+ typedef std::function<Tribool (
const QualifiedPackageName &
)> PreferOrAvoidFunction;
- typedef std::tr1::function<bool (
- const std::tr1::shared_ptr<const PackageID> &
+ typedef std::function<bool (
+ const std::shared_ptr<const PackageID> &
)> RemoveIfDependentFunction;
struct ResolverFunctions
diff --git a/paludis/resolver/resolver_test.cc b/paludis/resolver/resolver_test.cc
index b94d7d29e..6cf5e622a 100644
--- a/paludis/resolver/resolver_test.cc
+++ b/paludis/resolver/resolver_test.cc
@@ -63,7 +63,7 @@ using namespace paludis::resolver::resolver_test;
using namespace test;
std::string
-paludis::resolver::resolver_test::from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+paludis::resolver::resolver_test::from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k)
{
Map<std::string, std::string>::ConstIterator mm(m->find(k));
@@ -73,7 +73,7 @@ paludis::resolver::resolver_test::from_keys(const std::tr1::shared_ptr<const Map
return mm->second;
}
-const std::tr1::shared_ptr<Constraints>
+const std::shared_ptr<Constraints>
paludis::resolver::resolver_test::initial_constraints_for_fn(
const InitialConstraints & initial_constraints,
const Resolvent & resolvent)
@@ -85,19 +85,19 @@ paludis::resolver::resolver_test::initial_constraints_for_fn(
return i->second;
}
-std::tr1::shared_ptr<Resolvents>
+std::shared_ptr<Resolvents>
paludis::resolver::resolver_test::get_resolvents_for_fn(const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const SlotName> & slot,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const SlotName> & slot,
+ const std::shared_ptr<const Reason> &)
{
- std::tr1::shared_ptr<Resolvents> result(new Resolvents);
+ std::shared_ptr<Resolvents> result(new Resolvents);
result->push_back(Resolvent(spec, slot ? *slot : SlotName("0"), dt_install_to_slash));
return result;
}
FilteredGenerator
paludis::resolver::resolver_test::make_destination_filtered_generator_fn(const Generator & g,
- const std::tr1::shared_ptr<const Resolution> & resolution)
+ const std::shared_ptr<const Resolution> & resolution)
{
switch (resolution->resolvent().destination_type())
{
@@ -116,15 +116,15 @@ paludis::resolver::resolver_test::make_destination_filtered_generator_fn(const G
FilteredGenerator
paludis::resolver::resolver_test::make_origin_filtered_generator_fn(const Generator & g,
- const std::tr1::shared_ptr<const Resolution> &)
+ const std::shared_ptr<const Resolution> &)
{
return g;
}
DestinationTypes
paludis::resolver::resolver_test::get_destination_types_for_fn(const PackageDepSpec &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Reason> &)
{
return DestinationTypes() + dt_install_to_slash;
}
@@ -156,7 +156,7 @@ namespace
SpecInterest
paludis::resolver::resolver_test::interest_in_spec_fn(
- const std::tr1::shared_ptr<const Resolution> &, const SanitisedDependency & dep)
+ const std::shared_ptr<const Resolution> &, const SanitisedDependency & dep)
{
if (is_suggestion(dep))
return si_untaken;
@@ -166,17 +166,17 @@ paludis::resolver::resolver_test::interest_in_spec_fn(
UseExisting
paludis::resolver::resolver_test::get_use_existing_fn(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const Reason> &)
+ const std::shared_ptr<const Reason> &)
{
return ue_never;
}
-const std::tr1::shared_ptr<const Repository>
+const std::shared_ptr<const Repository>
paludis::resolver::resolver_test::find_repository_for_fn(
const Environment * const env,
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const ChangesToMakeDecision &)
{
return env->package_database()->fetch_repository(RepositoryName("installed"));
@@ -184,24 +184,24 @@ paludis::resolver::resolver_test::find_repository_for_fn(
bool
paludis::resolver::resolver_test::allowed_to_remove_fn(
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> & s,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const QualifiedPackageNameSet> & s,
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & i)
{
return s->end() != s->find(i->name());
}
bool
paludis::resolver::resolver_test::remove_if_dependent_fn(
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> & s,
- const std::tr1::shared_ptr<const PackageID> & i)
+ const std::shared_ptr<const QualifiedPackageNameSet> & s,
+ const std::shared_ptr<const PackageID> & i)
{
return s->end() != s->find(i->name());
}
Tribool
paludis::resolver::resolver_test::prefer_or_avoid_fn(
- const std::tr1::shared_ptr<const Map<QualifiedPackageName, bool> > & s,
+ const std::shared_ptr<const Map<QualifiedPackageName, bool> > & s,
const QualifiedPackageName & q)
{
const Map<QualifiedPackageName, bool>::ConstIterator r(s->find(q));
@@ -213,26 +213,26 @@ paludis::resolver::resolver_test::prefer_or_avoid_fn(
Tribool
paludis::resolver::resolver_test::order_early_fn(
- const std::tr1::shared_ptr<const Resolution> &)
+ const std::shared_ptr<const Resolution> &)
{
return indeterminate;
}
bool
paludis::resolver::resolver_test::confirm_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const RequiredConfirmation> &)
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const RequiredConfirmation> &)
{
return true;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
paludis::resolver::resolver_test::get_constraints_for_dependent_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids)
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids)
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
partial_spec.package(id->name());
@@ -244,7 +244,7 @@ paludis::resolver::resolver_test::get_constraints_for_dependent_fn(
for (ChangeByResolventSequence::ConstIterator i(ids->begin()), i_end(ids->end()) ;
i != i_end ; ++i)
{
- const std::tr1::shared_ptr<DependentReason> reason(new DependentReason(*i));
+ const std::shared_ptr<DependentReason> reason(new DependentReason(*i));
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = dt_install_to_slash,
@@ -259,13 +259,13 @@ paludis::resolver::resolver_test::get_constraints_for_dependent_fn(
return result;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
paludis::resolver::resolver_test::get_constraints_for_purge_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids)
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids)
{
- const std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ const std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
partial_spec.package(id->name());
@@ -274,7 +274,7 @@ paludis::resolver::resolver_test::get_constraints_for_purge_fn(
id->slot_key()->value(), false)));
PackageDepSpec spec(partial_spec);
- const std::tr1::shared_ptr<WasUsedByReason> reason(new WasUsedByReason(ids));
+ const std::shared_ptr<WasUsedByReason> reason(new WasUsedByReason(ids));
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = dt_install_to_slash,
@@ -288,16 +288,16 @@ paludis::resolver::resolver_test::get_constraints_for_purge_fn(
return result;
}
-const std::tr1::shared_ptr<ConstraintSequence>
+const std::shared_ptr<ConstraintSequence>
paludis::resolver::resolver_test::get_constraints_for_via_binary_fn(
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const Resolution> & because_resolution)
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const Resolution> & because_resolution)
{
PartiallyMadePackageDepSpec partial_spec((PartiallyMadePackageDepSpecOptions()));
partial_spec.package(resolution->resolvent().package());
PackageDepSpec spec(partial_spec);
- std::tr1::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
+ std::shared_ptr<ConstraintSequence> result(new ConstraintSequence);
result->push_back(make_shared_ptr(new Constraint(make_named_values<Constraint>(
n::destination_type() = resolution->resolvent().destination_type(),
n::nothing_is_fine_too() = false,
@@ -312,14 +312,14 @@ paludis::resolver::resolver_test::get_constraints_for_via_binary_fn(
bool
paludis::resolver::resolver_test::can_use_fn(
- const std::tr1::shared_ptr<const PackageID> &)
+ const std::shared_ptr<const PackageID> &)
{
return true;
}
bool
paludis::resolver::resolver_test::always_via_binary_fn(
- const std::tr1::shared_ptr<const Resolution> &)
+ const std::shared_ptr<const Resolution> &)
{
return false;
}
@@ -331,7 +331,7 @@ ResolverTestCase::ResolverTestCase(const std::string & t, const std::string & s,
remove_if_dependent_names(new QualifiedPackageNameSet),
prefer_or_avoid_names(new Map<QualifiedPackageName, bool>)
{
- std::tr1::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
+ std::shared_ptr<Map<std::string, std::string> > keys(new Map<std::string, std::string>);
keys->insert("format", "e");
keys->insert("names_cache", "/var/empty");
keys->insert("location", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "repo"));
@@ -343,7 +343,7 @@ ResolverTestCase::ResolverTestCase(const std::string & t, const std::string & s,
keys->insert("distdir", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "distdir"));
keys->insert("builddir", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "build"));
repo = RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1));
+ std::bind(from_keys, keys, std::placeholders::_1));
env.package_database()->add_repository(1, repo);
keys.reset(new Map<std::string, std::string>);
@@ -353,7 +353,7 @@ ResolverTestCase::ResolverTestCase(const std::string & t, const std::string & s,
keys->insert("location", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "installed"));
keys->insert("builddir", stringify(FSEntry::cwd() / ("resolver_TEST_" + t + "_dir") / "build"));
inst_repo = RepositoryFactory::get_instance()->create(&env,
- std::tr1::bind(from_keys, keys, std::tr1::placeholders::_1));
+ std::bind(from_keys, keys, std::placeholders::_1));
env.package_database()->add_repository(1, inst_repo);
fake_inst_repo.reset(new FakeInstalledRepository(
@@ -375,34 +375,34 @@ ResolverFunctions
ResolverTestCase::get_resolver_functions(InitialConstraints & initial_constraints)
{
return make_named_values<ResolverFunctions>(
- n::allowed_to_remove_fn() = std::tr1::bind(&allowed_to_remove_fn,
- allowed_to_remove_names, std::tr1::placeholders::_1, std::tr1::placeholders::_2),
+ n::allowed_to_remove_fn() = std::bind(&allowed_to_remove_fn,
+ allowed_to_remove_names, std::placeholders::_1, std::placeholders::_2),
n::always_via_binary_fn() = &always_via_binary_fn,
n::can_use_fn() = &can_use_fn,
n::confirm_fn() = &confirm_fn,
- n::find_repository_for_fn() = std::tr1::bind(&find_repository_for_fn,
- &env, std::tr1::placeholders::_1, std::tr1::placeholders::_2),
+ n::find_repository_for_fn() = std::bind(&find_repository_for_fn,
+ &env, std::placeholders::_1, std::placeholders::_2),
n::get_constraints_for_dependent_fn() = &get_constraints_for_dependent_fn,
n::get_constraints_for_purge_fn() = &get_constraints_for_purge_fn,
n::get_constraints_for_via_binary_fn() = &get_constraints_for_via_binary_fn,
n::get_destination_types_for_fn() = &get_destination_types_for_fn,
n::get_initial_constraints_for_fn() =
- std::tr1::bind(&initial_constraints_for_fn, std::tr1::ref(initial_constraints),
- std::tr1::placeholders::_1),
+ std::bind(&initial_constraints_for_fn, std::ref(initial_constraints),
+ std::placeholders::_1),
n::get_resolvents_for_fn() = &get_resolvents_for_fn,
n::get_use_existing_fn() = &get_use_existing_fn,
n::interest_in_spec_fn() = &interest_in_spec_fn,
n::make_destination_filtered_generator_fn() = &make_destination_filtered_generator_fn,
n::make_origin_filtered_generator_fn() = &make_origin_filtered_generator_fn,
n::order_early_fn() = &order_early_fn,
- n::prefer_or_avoid_fn() = std::tr1::bind(&prefer_or_avoid_fn,
- prefer_or_avoid_names, std::tr1::placeholders::_1),
- n::remove_if_dependent_fn() = std::tr1::bind(&remove_if_dependent_fn,
- remove_if_dependent_names, std::tr1::placeholders::_1)
+ n::prefer_or_avoid_fn() = std::bind(&prefer_or_avoid_fn,
+ prefer_or_avoid_names, std::placeholders::_1),
+ n::remove_if_dependent_fn() = std::bind(&remove_if_dependent_fn,
+ remove_if_dependent_names, std::placeholders::_1)
);
}
-const std::tr1::shared_ptr<const Resolved>
+const std::shared_ptr<const Resolved>
ResolverTestCase::get_resolved(const PackageOrBlockDepSpec & target)
{
InitialConstraints initial_constraints;
@@ -423,7 +423,7 @@ ResolverTestCase::get_resolved(const PackageOrBlockDepSpec & target)
}
}
-const std::tr1::shared_ptr<const Resolved>
+const std::shared_ptr<const Resolved>
ResolverTestCase::get_resolved(const std::string & target)
{
PackageDepSpec target_spec(parse_user_package_dep_spec(target, &env, UserPackageDepSpecOptions()));
@@ -433,13 +433,13 @@ ResolverTestCase::get_resolved(const std::string & target)
namespace
{
template <typename T_>
- std::tr1::shared_ptr<T_> get_decision(const std::tr1::shared_ptr<T_> & d)
+ std::shared_ptr<T_> get_decision(const std::shared_ptr<T_> & d)
{
return d;
}
template <typename T_, typename N_>
- std::tr1::shared_ptr<T_> get_decision(const std::pair<std::tr1::shared_ptr<T_>, N_> & d)
+ std::shared_ptr<T_> get_decision(const std::pair<std::shared_ptr<T_>, N_> & d)
{
return d.first;
}
@@ -448,8 +448,8 @@ namespace
template <typename Decisions_>
void
ResolverTestCase::check_resolved_one(
- const std::tr1::shared_ptr<Decisions_> & decisions,
- const std::tr1::shared_ptr<const DecisionChecks> & decision_checks)
+ const std::shared_ptr<Decisions_> & decisions,
+ const std::shared_ptr<const DecisionChecks> & decision_checks)
{
DecisionChecks::List::const_iterator decision_check(decision_checks->checks.begin()), decision_check_end(decision_checks->checks.end());
typename Decisions_::ConstIterator decision(decisions->begin()), decision_end(decisions->end());
@@ -459,7 +459,7 @@ ResolverTestCase::check_resolved_one(
if (decision_check == decision_check_end)
break;
- std::tr1::shared_ptr<const Decision> d;
+ std::shared_ptr<const Decision> d;
if (decision != decision_end)
d = get_decision(*decision++);
@@ -473,13 +473,13 @@ ResolverTestCase::check_resolved_one(
void
ResolverTestCase::check_resolved(
- const std::tr1::shared_ptr<const Resolved> & resolved,
- const NamedValue<n::taken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_change_or_remove_decisions,
- const NamedValue<n::taken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_unable_to_make_decisions,
- const NamedValue<n::taken_unconfirmed_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_unconfirmed_decisions,
- const NamedValue<n::taken_unorderable_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & taken_unorderable_decisions,
- const NamedValue<n::untaken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & untaken_change_or_remove_decisions,
- const NamedValue<n::untaken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > & untaken_unable_to_make_decisions
+ const std::shared_ptr<const Resolved> & resolved,
+ const NamedValue<n::taken_change_or_remove_decisions, const std::shared_ptr<const DecisionChecks> > & taken_change_or_remove_decisions,
+ const NamedValue<n::taken_unable_to_make_decisions, const std::shared_ptr<const DecisionChecks> > & taken_unable_to_make_decisions,
+ const NamedValue<n::taken_unconfirmed_decisions, const std::shared_ptr<const DecisionChecks> > & taken_unconfirmed_decisions,
+ const NamedValue<n::taken_unorderable_decisions, const std::shared_ptr<const DecisionChecks> > & taken_unorderable_decisions,
+ const NamedValue<n::untaken_change_or_remove_decisions, const std::shared_ptr<const DecisionChecks> > & untaken_change_or_remove_decisions,
+ const NamedValue<n::untaken_unable_to_make_decisions, const std::shared_ptr<const DecisionChecks> > & untaken_unable_to_make_decisions
)
{
{
@@ -527,8 +527,8 @@ ResolverTestCase::DecisionChecks &
ResolverTestCase::DecisionChecks::breaking(const QualifiedPackageName & q)
{
checks.push_back(std::make_pair(
- std::tr1::bind(&check_breaking, q, std::tr1::placeholders::_1),
- std::tr1::bind(&check_breaking_msg, q, std::tr1::placeholders::_1)
+ std::bind(&check_breaking, q, std::placeholders::_1),
+ std::bind(&check_breaking_msg, q, std::placeholders::_1)
));
return *this;
}
@@ -537,8 +537,8 @@ ResolverTestCase::DecisionChecks &
ResolverTestCase::DecisionChecks::change(const QualifiedPackageName & q)
{
checks.push_back(std::make_pair(
- std::tr1::bind(&check_change, q, std::tr1::placeholders::_1),
- std::tr1::bind(&check_change_msg, q, std::tr1::placeholders::_1)
+ std::bind(&check_change, q, std::placeholders::_1),
+ std::bind(&check_change_msg, q, std::placeholders::_1)
));
return *this;
}
@@ -547,8 +547,8 @@ ResolverTestCase::DecisionChecks &
ResolverTestCase::DecisionChecks::remove(const QualifiedPackageName & q)
{
checks.push_back(std::make_pair(
- std::tr1::bind(&check_remove, q, std::tr1::placeholders::_1),
- std::tr1::bind(&check_remove_msg, q, std::tr1::placeholders::_1)
+ std::bind(&check_remove, q, std::placeholders::_1),
+ std::bind(&check_remove_msg, q, std::placeholders::_1)
));
return *this;
}
@@ -557,26 +557,26 @@ ResolverTestCase::DecisionChecks &
ResolverTestCase::DecisionChecks::unable(const QualifiedPackageName & q)
{
checks.push_back(std::make_pair(
- std::tr1::bind(&check_unable, q, std::tr1::placeholders::_1),
- std::tr1::bind(&check_unable_msg, q, std::tr1::placeholders::_1)
+ std::bind(&check_unable, q, std::placeholders::_1),
+ std::bind(&check_unable_msg, q, std::placeholders::_1)
));
return *this;
}
bool
-ResolverTestCase::DecisionChecks::check_finished(const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_finished(const std::shared_ptr<const Decision> & r)
{
return ! r;
}
std::string
-ResolverTestCase::DecisionChecks::check_finished_msg(const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_finished_msg(const std::shared_ptr<const Decision> & r)
{
return check_generic_msg("finished", r);
}
bool
-ResolverTestCase::DecisionChecks::check_change(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & d)
+ResolverTestCase::DecisionChecks::check_change(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & d)
{
if (! d)
return false;
@@ -585,7 +585,7 @@ ResolverTestCase::DecisionChecks::check_change(const QualifiedPackageName & q, c
}
bool
-ResolverTestCase::DecisionChecks::check_breaking(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & d)
+ResolverTestCase::DecisionChecks::check_breaking(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & d)
{
if (! d)
return false;
@@ -594,7 +594,7 @@ ResolverTestCase::DecisionChecks::check_breaking(const QualifiedPackageName & q,
}
bool
-ResolverTestCase::DecisionChecks::check_remove(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & d)
+ResolverTestCase::DecisionChecks::check_remove(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & d)
{
if (! d)
return false;
@@ -603,7 +603,7 @@ ResolverTestCase::DecisionChecks::check_remove(const QualifiedPackageName & q, c
}
bool
-ResolverTestCase::DecisionChecks::check_unable(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & d)
+ResolverTestCase::DecisionChecks::check_unable(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & d)
{
if (! d)
return false;
@@ -612,25 +612,25 @@ ResolverTestCase::DecisionChecks::check_unable(const QualifiedPackageName & q, c
}
std::string
-ResolverTestCase::DecisionChecks::check_change_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_change_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r)
{
return check_generic_msg(stringify(q), r);
}
std::string
-ResolverTestCase::DecisionChecks::check_breaking_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_breaking_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r)
{
return check_generic_msg("break " + stringify(q), r);
}
std::string
-ResolverTestCase::DecisionChecks::check_remove_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_remove_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r)
{
return check_generic_msg("remove " + stringify(q), r);
}
std::string
-ResolverTestCase::DecisionChecks::check_unable_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_unable_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r)
{
return check_generic_msg("unable " + stringify(q), r);
}
@@ -672,7 +672,7 @@ namespace
}
std::string
-ResolverTestCase::DecisionChecks::check_generic_msg(const std::string & q, const std::tr1::shared_ptr<const Decision> & r)
+ResolverTestCase::DecisionChecks::check_generic_msg(const std::string & q, const std::shared_ptr<const Decision> & r)
{
if (! r)
return "Expected " + stringify(q) + " but got finished";
@@ -680,7 +680,7 @@ ResolverTestCase::DecisionChecks::check_generic_msg(const std::string & q, const
return "Expected " + stringify(q) + " but got " + r->accept_returning<std::string>(DecisionStringifier());
}
-const std::tr1::shared_ptr<FakePackageID>
+const std::shared_ptr<FakePackageID>
ResolverTestCase::install(const std::string & c, const std::string & p, const std::string & v)
{
return fake_inst_repo->add_version(c, p, v);
diff --git a/paludis/resolver/resolver_test.hh b/paludis/resolver/resolver_test.hh
index 3561c8cd8..8cac1bdf3 100644
--- a/paludis/resolver/resolver_test.hh
+++ b/paludis/resolver/resolver_test.hh
@@ -42,7 +42,7 @@
#include <paludis/filtered_generator-fwd.hh>
#include <paludis/generator-fwd.hh>
#include <test/test_framework.hh>
-#include <tr1/memory>
+#include <memory>
#include <string>
#include <map>
#include <list>
@@ -53,126 +53,126 @@ namespace paludis
{
namespace resolver_test
{
- std::string from_keys(const std::tr1::shared_ptr<const Map<std::string, std::string> > & m,
+ std::string from_keys(const std::shared_ptr<const Map<std::string, std::string> > & m,
const std::string & k);
- typedef std::map<Resolvent, std::tr1::shared_ptr<Constraints> > InitialConstraints;
+ typedef std::map<Resolvent, std::shared_ptr<Constraints> > InitialConstraints;
SpecInterest interest_in_spec_fn(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const SanitisedDependency &);
- const std::tr1::shared_ptr<Constraints> initial_constraints_for_fn(
+ const std::shared_ptr<Constraints> initial_constraints_for_fn(
const InitialConstraints & initial_constraints,
const Resolvent & resolvent);
- const std::tr1::shared_ptr<ConstraintSequence>
+ const std::shared_ptr<ConstraintSequence>
get_constraints_for_dependent_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids);
- const std::tr1::shared_ptr<ConstraintSequence>
+ const std::shared_ptr<ConstraintSequence>
get_constraints_for_purge_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const ChangeByResolventSequence> & ids);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const ChangeByResolventSequence> & ids);
- const std::tr1::shared_ptr<ConstraintSequence>
+ const std::shared_ptr<ConstraintSequence>
get_constraints_for_via_binary_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const Resolution> &);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &);
- std::tr1::shared_ptr<Resolvents> get_resolvents_for_fn(const PackageDepSpec & spec,
- const std::tr1::shared_ptr<const SlotName> &,
- const std::tr1::shared_ptr<const Reason> &);
+ std::shared_ptr<Resolvents> get_resolvents_for_fn(const PackageDepSpec & spec,
+ const std::shared_ptr<const SlotName> &,
+ const std::shared_ptr<const Reason> &);
UseExisting get_use_existing_fn(
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const PackageDepSpec &,
- const std::tr1::shared_ptr<const Reason> &);
+ const std::shared_ptr<const Reason> &);
- const std::tr1::shared_ptr<const Repository> find_repository_for_fn(
+ const std::shared_ptr<const Repository> find_repository_for_fn(
const Environment * const,
- const std::tr1::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const Resolution> &,
const ChangesToMakeDecision &);
FilteredGenerator make_destination_filtered_generator_fn(const Generator &,
- const std::tr1::shared_ptr<const Resolution> &);
+ const std::shared_ptr<const Resolution> &);
FilteredGenerator make_origin_filtered_generator_fn(const Generator &,
- const std::tr1::shared_ptr<const Resolution> &);
+ const std::shared_ptr<const Resolution> &);
DestinationTypes get_destination_types_for_fn(const PackageDepSpec &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const Reason> &);
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const Reason> &);
bool allowed_to_remove_fn(
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> &,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &);
+ const std::shared_ptr<const QualifiedPackageNameSet> &,
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &);
bool remove_if_dependent_fn(
- const std::tr1::shared_ptr<const QualifiedPackageNameSet> &,
- const std::tr1::shared_ptr<const PackageID> &);
+ const std::shared_ptr<const QualifiedPackageNameSet> &,
+ const std::shared_ptr<const PackageID> &);
Tribool prefer_or_avoid_fn(
- const std::tr1::shared_ptr<const Map<QualifiedPackageName, bool> > &,
+ const std::shared_ptr<const Map<QualifiedPackageName, bool> > &,
const QualifiedPackageName &);
Tribool order_early_fn(
- const std::tr1::shared_ptr<const Resolution> &);
+ const std::shared_ptr<const Resolution> &);
bool confirm_fn(
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const RequiredConfirmation> &);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const RequiredConfirmation> &);
bool can_use_fn(
- const std::tr1::shared_ptr<const PackageID> &);
+ const std::shared_ptr<const PackageID> &);
bool always_via_binary_fn(
- const std::tr1::shared_ptr<const Resolution> &);
+ const std::shared_ptr<const Resolution> &);
struct ResolverTestCase : test::TestCase
{
TestEnvironment env;
- std::tr1::shared_ptr<Repository> repo, inst_repo;
- std::tr1::shared_ptr<FakeInstalledRepository> fake_inst_repo;
- std::tr1::shared_ptr<QualifiedPackageNameSet> allowed_to_remove_names;
- std::tr1::shared_ptr<QualifiedPackageNameSet> remove_if_dependent_names;
- std::tr1::shared_ptr<Map<QualifiedPackageName, bool> > prefer_or_avoid_names;
+ std::shared_ptr<Repository> repo, inst_repo;
+ std::shared_ptr<FakeInstalledRepository> fake_inst_repo;
+ std::shared_ptr<QualifiedPackageNameSet> allowed_to_remove_names;
+ std::shared_ptr<QualifiedPackageNameSet> remove_if_dependent_names;
+ std::shared_ptr<Map<QualifiedPackageName, bool> > prefer_or_avoid_names;
ResolverTestCase(const std::string & group, const std::string & test_name, const std::string & eapi,
const std::string & layout);
- const std::tr1::shared_ptr<const Resolved> get_resolved(const PackageOrBlockDepSpec & target);
- const std::tr1::shared_ptr<const Resolved> get_resolved(const std::string & target);
+ const std::shared_ptr<const Resolved> get_resolved(const PackageOrBlockDepSpec & target);
+ const std::shared_ptr<const Resolved> get_resolved(const std::string & target);
virtual ResolverFunctions get_resolver_functions(InitialConstraints &);
struct DecisionChecks
{
- typedef std::tr1::function<bool (const std::tr1::shared_ptr<const Decision> &) > CheckFunction;
- typedef std::tr1::function<std::string (const std::tr1::shared_ptr<const Decision> &) > MessageFunction;
+ typedef std::function<bool (const std::shared_ptr<const Decision> &) > CheckFunction;
+ typedef std::function<std::string (const std::shared_ptr<const Decision> &) > MessageFunction;
typedef std::list<std::pair<CheckFunction, MessageFunction> > List;
List checks;
- static std::string check_generic_msg(const std::string & q, const std::tr1::shared_ptr<const Decision> & r);
+ static std::string check_generic_msg(const std::string & q, const std::shared_ptr<const Decision> & r);
- static bool check_change(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
- static std::string check_change_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
+ static bool check_change(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
+ static std::string check_change_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
- static bool check_remove(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
- static std::string check_remove_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
+ static bool check_remove(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
+ static std::string check_remove_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
- static bool check_unable(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
- static std::string check_unable_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
+ static bool check_unable(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
+ static std::string check_unable_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
- static bool check_breaking(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
- static std::string check_breaking_msg(const QualifiedPackageName & q, const std::tr1::shared_ptr<const Decision> & r);
+ static bool check_breaking(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
+ static std::string check_breaking_msg(const QualifiedPackageName & q, const std::shared_ptr<const Decision> & r);
- static bool check_finished(const std::tr1::shared_ptr<const Decision> & r);
- static std::string check_finished_msg(const std::tr1::shared_ptr<const Decision> & r);
+ static bool check_finished(const std::shared_ptr<const Decision> & r);
+ static std::string check_finished_msg(const std::shared_ptr<const Decision> & r);
DecisionChecks & change(const QualifiedPackageName & q);
DecisionChecks & remove(const QualifiedPackageName & q);
@@ -183,20 +183,20 @@ namespace paludis
template <typename Decisions_>
void check_resolved_one(
- const std::tr1::shared_ptr<Decisions_> &,
- const std::tr1::shared_ptr<const DecisionChecks> &);
+ const std::shared_ptr<Decisions_> &,
+ const std::shared_ptr<const DecisionChecks> &);
void check_resolved(
- const std::tr1::shared_ptr<const Resolved> &,
- const NamedValue<n::taken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
- const NamedValue<n::taken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
- const NamedValue<n::taken_unconfirmed_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
- const NamedValue<n::taken_unorderable_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
- const NamedValue<n::untaken_change_or_remove_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &,
- const NamedValue<n::untaken_unable_to_make_decisions, const std::tr1::shared_ptr<const DecisionChecks> > &
+ const std::shared_ptr<const Resolved> &,
+ const NamedValue<n::taken_change_or_remove_decisions, const std::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::taken_unable_to_make_decisions, const std::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::taken_unconfirmed_decisions, const std::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::taken_unorderable_decisions, const std::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::untaken_change_or_remove_decisions, const std::shared_ptr<const DecisionChecks> > &,
+ const NamedValue<n::untaken_unable_to_make_decisions, const std::shared_ptr<const DecisionChecks> > &
);
- const std::tr1::shared_ptr<FakePackageID> install(
+ const std::shared_ptr<FakePackageID> install(
const std::string & c, const std::string & p, const std::string & v);
};
}
diff --git a/paludis/resolver/sanitised_dependencies.cc b/paludis/resolver/sanitised_dependencies.cc
index afff6639b..1daaeaebf 100644
--- a/paludis/resolver/sanitised_dependencies.cc
+++ b/paludis/resolver/sanitised_dependencies.cc
@@ -109,9 +109,9 @@ namespace
struct AnyDepSpecChildHandler
{
const Decider & decider;
- const std::tr1::shared_ptr<const Resolution> our_resolution;
- const std::tr1::shared_ptr<const PackageID> our_id;
- const std::tr1::function<SanitisedDependency (const PackageOrBlockDepSpec &)> parent_make_sanitised;
+ const std::shared_ptr<const Resolution> our_resolution;
+ const std::shared_ptr<const PackageID> our_id;
+ const std::function<SanitisedDependency (const PackageOrBlockDepSpec &)> parent_make_sanitised;
bool super_complicated, nested;
@@ -120,9 +120,9 @@ namespace
bool seen_any;
- AnyDepSpecChildHandler(const Decider & r, const std::tr1::shared_ptr<const Resolution> & q,
- const std::tr1::shared_ptr<const PackageID> & o,
- const std::tr1::function<SanitisedDependency (const PackageOrBlockDepSpec &)> & f) :
+ AnyDepSpecChildHandler(const Decider & r, const std::shared_ptr<const Resolution> & q,
+ const std::shared_ptr<const PackageID> & o,
+ const std::function<SanitisedDependency (const PackageOrBlockDepSpec &)> & f) :
decider(r),
our_resolution(q),
our_id(o),
@@ -138,7 +138,7 @@ namespace
{
seen_any = true;
- const std::tr1::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(spec,
+ const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(spec,
make_shared_copy(our_resolution->resolvent())));
if (if_rewritten)
if_rewritten->as_spec_tree()->root()->accept(*this);
@@ -219,7 +219,7 @@ namespace
std::list<SanitisedDependency> l;
h.commit(
parent_make_sanitised,
- std::tr1::bind(&list_push_back<SanitisedDependency>, &l, std::tr1::placeholders::_1)
+ std::bind(&list_push_back<SanitisedDependency>, &l, std::placeholders::_1)
);
if (active_sublist)
@@ -249,8 +249,8 @@ namespace
}
void commit(
- const std::tr1::function<SanitisedDependency (const PackageOrBlockDepSpec &)> & make_sanitised,
- const std::tr1::function<void (const SanitisedDependency &)> & apply)
+ const std::function<SanitisedDependency (const PackageOrBlockDepSpec &)> & make_sanitised,
+ const std::function<void (const SanitisedDependency &)> & apply)
{
if (! seen_any)
{
@@ -300,21 +300,21 @@ namespace
{
const Environment * const env;
const Decider & decider;
- const std::tr1::shared_ptr<const Resolution> our_resolution;
- const std::tr1::shared_ptr<const PackageID> & our_id;
+ const std::shared_ptr<const Resolution> our_resolution;
+ const std::shared_ptr<const PackageID> & our_id;
SanitisedDependencies & sanitised_dependencies;
const std::string raw_name;
const std::string human_name;
std::string original_specs_as_string;
- std::list<std::tr1::shared_ptr<const DependenciesLabelSequence> > labels_stack;
+ std::list<std::shared_ptr<const DependenciesLabelSequence> > labels_stack;
Finder(
const Environment * const e,
const Decider & r,
- const std::tr1::shared_ptr<const Resolution> & q,
- const std::tr1::shared_ptr<const PackageID> & f,
+ const std::shared_ptr<const Resolution> & q,
+ const std::shared_ptr<const PackageID> & f,
SanitisedDependencies & s,
- const std::tr1::shared_ptr<const DependenciesLabelSequence> & l,
+ const std::shared_ptr<const DependenciesLabelSequence> & l,
const std::string & rn,
const std::string & hn,
const std::string & a) :
@@ -333,7 +333,7 @@ namespace
void add(const SanitisedDependency & dep)
{
- const std::tr1::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(dep.spec(),
+ const std::shared_ptr<const RewrittenSpec> if_rewritten(decider.rewrite_if_special(dep.spec(),
make_shared_copy(our_resolution->resolvent())));
if (if_rewritten)
if_rewritten->as_spec_tree()->root()->accept(*this);
@@ -397,17 +397,17 @@ namespace
}
AnyDepSpecChildHandler h(decider, our_resolution, our_id,
- std::tr1::bind(&Finder::make_sanitised, this, std::tr1::placeholders::_1));
+ std::bind(&Finder::make_sanitised, this, std::placeholders::_1));
std::for_each(indirect_iterator(node.begin()), indirect_iterator(node.end()), accept_visitor(h));
h.commit(
- std::tr1::bind(&Finder::make_sanitised, this, std::tr1::placeholders::_1),
- std::tr1::bind(&Finder::add, this, std::tr1::placeholders::_1)
+ std::bind(&Finder::make_sanitised, this, std::placeholders::_1),
+ std::bind(&Finder::add, this, std::placeholders::_1)
);
}
void visit(const DependencySpecTree::NodeType<NamedSetDepSpec>::Type & node)
{
- const std::tr1::shared_ptr<const SetSpecTree> set(env->set(node.spec()->name()));
+ const std::shared_ptr<const SetSpecTree> set(env->set(node.spec()->name()));
if (set)
set->root()->accept(*this);
else
@@ -416,7 +416,7 @@ namespace
void visit(const DependencySpecTree::NodeType<DependenciesLabelsDepSpec>::Type & node)
{
- std::tr1::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence);
+ std::shared_ptr<DependenciesLabelSequence> labels(new DependenciesLabelSequence);
std::copy(node.spec()->begin(), node.spec()->end(), labels->back_inserter());
*labels_stack.begin() = labels;
}
@@ -451,9 +451,9 @@ void
SanitisedDependencies::_populate_one(
const Environment * const env,
const Decider & decider,
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id,
- const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > (PackageID::* const pmf) () const
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id,
+ const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > (PackageID::* const pmf) () const
)
{
Context context("When finding dependencies for '" + stringify(*id) + "' from key '" + ((*id).*pmf)()->raw_name() + "':");
@@ -467,8 +467,8 @@ void
SanitisedDependencies::populate(
const Environment * const env,
const Decider & decider,
- const std::tr1::shared_ptr<const Resolution> & resolution,
- const std::tr1::shared_ptr<const PackageID> & id)
+ const std::shared_ptr<const Resolution> & resolution,
+ const std::shared_ptr<const PackageID> & id)
{
Context context("When finding dependencies for '" + stringify(*id) + "':");
@@ -518,7 +518,7 @@ SanitisedDependency::serialise(Serialiser & s) const
}
SanitisedDependency
-SanitisedDependency::deserialise(Deserialisation & d, const std::tr1::shared_ptr<const PackageID> & from_id)
+SanitisedDependency::deserialise(Deserialisation & d, const std::shared_ptr<const PackageID> & from_id)
{
Context context("When deserialising:");
diff --git a/paludis/resolver/sanitised_dependencies.hh b/paludis/resolver/sanitised_dependencies.hh
index c265c84b7..7b405a1c4 100644
--- a/paludis/resolver/sanitised_dependencies.hh
+++ b/paludis/resolver/sanitised_dependencies.hh
@@ -47,7 +47,7 @@ namespace paludis
{
struct SanitisedDependency
{
- NamedValue<n::active_dependency_labels, std::tr1::shared_ptr<const DependenciesLabelSequence> > active_dependency_labels;
+ NamedValue<n::active_dependency_labels, std::shared_ptr<const DependenciesLabelSequence> > active_dependency_labels;
NamedValue<n::active_dependency_labels_as_string, std::string> active_dependency_labels_as_string;
NamedValue<n::metadata_key_human_name, std::string> metadata_key_human_name;
NamedValue<n::metadata_key_raw_name, std::string> metadata_key_raw_name;
@@ -58,7 +58,7 @@ namespace paludis
static SanitisedDependency deserialise(
Deserialisation & d,
- const std::tr1::shared_ptr<const PackageID> & for_id) PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const PackageID> & for_id) PALUDIS_ATTRIBUTE((warn_unused_result));
};
class SanitisedDependencies :
@@ -68,9 +68,9 @@ namespace paludis
void _populate_one(
const Environment * const,
const Decider &,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &,
- const std::tr1::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > (PackageID::* const) () const
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &,
+ const std::shared_ptr<const MetadataSpecTreeKey<DependencySpecTree> > (PackageID::* const) () const
);
public:
@@ -80,8 +80,8 @@ namespace paludis
void populate(
const Environment * const,
const Decider &,
- const std::tr1::shared_ptr<const Resolution> &,
- const std::tr1::shared_ptr<const PackageID> &);
+ const std::shared_ptr<const Resolution> &,
+ const std::shared_ptr<const PackageID> &);
void add(const SanitisedDependency & d);
diff --git a/paludis/resolver/slot_name_or_null.hh b/paludis/resolver/slot_name_or_null.hh
index 669aa79ad..9d8bbae18 100644
--- a/paludis/resolver/slot_name_or_null.hh
+++ b/paludis/resolver/slot_name_or_null.hh
@@ -37,7 +37,7 @@ namespace paludis
{
struct SlotNameOrNull
{
- NamedValue<n::name_or_null, std::tr1::shared_ptr<const SlotName> > name_or_null;
+ NamedValue<n::name_or_null, std::shared_ptr<const SlotName> > name_or_null;
NamedValue<n::null_means_unknown, bool> null_means_unknown;
void serialise(Serialiser &) const;
diff --git a/paludis/resolver/spec_rewriter.cc b/paludis/resolver/spec_rewriter.cc
index d47bbb873..2cb19e931 100644
--- a/paludis/resolver/spec_rewriter.cc
+++ b/paludis/resolver/spec_rewriter.cc
@@ -45,10 +45,10 @@ using namespace paludis::resolver;
typedef std::map<QualifiedPackageName, std::set<QualifiedPackageName> > Rewrites;
-const std::tr1::shared_ptr<const DependencySpecTree>
+const std::shared_ptr<const DependencySpecTree>
RewrittenSpec::as_spec_tree() const
{
- const std::tr1::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec)));
+ const std::shared_ptr<DependencySpecTree> result(new DependencySpecTree(make_shared_ptr(new AllDepSpec)));
for (Sequence<PackageOrBlockDepSpec>::ConstIterator i(specs()->begin()), i_end(specs()->end()) ;
i != i_end ; ++i)
@@ -86,8 +86,8 @@ SpecRewriter::SpecRewriter(const Environment * const e) :
SpecRewriter::~SpecRewriter() = default;
-const std::tr1::shared_ptr<const RewrittenSpec>
-SpecRewriter::rewrite_if_special(const PackageOrBlockDepSpec & s, const std::tr1::shared_ptr<const Resolvent> & maybe_our_resolvent) const
+const std::shared_ptr<const RewrittenSpec>
+SpecRewriter::rewrite_if_special(const PackageOrBlockDepSpec & s, const std::shared_ptr<const Resolvent> & maybe_our_resolvent) const
{
if (s.if_package() && s.if_package()->package_ptr())
{
@@ -99,7 +99,7 @@ SpecRewriter::rewrite_if_special(const PackageOrBlockDepSpec & s, const std::tr1
if (r == _imp->rewrites.end())
return make_null_shared_ptr();
- const std::tr1::shared_ptr<RewrittenSpec> result(new RewrittenSpec(make_named_values<RewrittenSpec>(
+ const std::shared_ptr<RewrittenSpec> result(new RewrittenSpec(make_named_values<RewrittenSpec>(
n::specs() = make_shared_ptr(new Sequence<PackageOrBlockDepSpec>)
)));
@@ -119,7 +119,7 @@ SpecRewriter::rewrite_if_special(const PackageOrBlockDepSpec & s, const std::tr1
if (r == _imp->rewrites.end())
return make_null_shared_ptr();
- const std::tr1::shared_ptr<RewrittenSpec> result(new RewrittenSpec(make_named_values<RewrittenSpec>(
+ const std::shared_ptr<RewrittenSpec> result(new RewrittenSpec(make_named_values<RewrittenSpec>(
n::specs() = make_shared_ptr(new Sequence<PackageOrBlockDepSpec>)
)));
@@ -152,7 +152,7 @@ SpecRewriter::_need_rewrites() const
return;
_imp->has_rewrites = true;
- const std::tr1::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::AllVersionsSorted(
+ const std::shared_ptr<const PackageIDSequence> ids((*_imp->env)[selection::AllVersionsSorted(
generator::InRepository(RepositoryName("virtuals")) +
generator::InRepository(RepositoryName("installed-virtuals"))
)]);
diff --git a/paludis/resolver/spec_rewriter.hh b/paludis/resolver/spec_rewriter.hh
index 749f658fe..59464df5c 100644
--- a/paludis/resolver/spec_rewriter.hh
+++ b/paludis/resolver/spec_rewriter.hh
@@ -43,9 +43,9 @@ namespace paludis
{
struct RewrittenSpec
{
- NamedValue<n::specs, std::tr1::shared_ptr<Sequence<PackageOrBlockDepSpec> > > specs;
+ NamedValue<n::specs, std::shared_ptr<Sequence<PackageOrBlockDepSpec> > > specs;
- const std::tr1::shared_ptr<const DependencySpecTree> as_spec_tree() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const DependencySpecTree> as_spec_tree() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
class PALUDIS_VISIBLE SpecRewriter :
@@ -58,8 +58,8 @@ namespace paludis
SpecRewriter(const Environment * const);
~SpecRewriter();
- const std::tr1::shared_ptr<const RewrittenSpec> rewrite_if_special(const PackageOrBlockDepSpec &,
- const std::tr1::shared_ptr<const Resolvent> & maybe_from) const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const RewrittenSpec> rewrite_if_special(const PackageOrBlockDepSpec &,
+ const std::shared_ptr<const Resolvent> & maybe_from) const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/strongly_connected_component.hh b/paludis/resolver/strongly_connected_component.hh
index 9edca2f7c..817c4a41c 100644
--- a/paludis/resolver/strongly_connected_component.hh
+++ b/paludis/resolver/strongly_connected_component.hh
@@ -28,7 +28,7 @@
#include <paludis/util/sequence.hh>
#include <paludis/util/wrapped_forward_iterator.hh>
#include <paludis/util/wrapped_output_iterator.hh>
-#include <tr1/memory>
+#include <memory>
namespace paludis
{
@@ -42,8 +42,8 @@ namespace paludis
{
struct StronglyConnectedComponent
{
- NamedValue<n::nodes, std::tr1::shared_ptr<Set<NAGIndex> > > nodes;
- NamedValue<n::requirements, std::tr1::shared_ptr<Set<NAGIndex> > > requirements;
+ NamedValue<n::nodes, std::shared_ptr<Set<NAGIndex> > > nodes;
+ NamedValue<n::requirements, std::shared_ptr<Set<NAGIndex> > > requirements;
};
}
diff --git a/paludis/resolver/suggest_restart.cc b/paludis/resolver/suggest_restart.cc
index 45c7ac593..b2d0d11d4 100644
--- a/paludis/resolver/suggest_restart.cc
+++ b/paludis/resolver/suggest_restart.cc
@@ -32,16 +32,16 @@ namespace paludis
struct Implementation<SuggestRestart>
{
const Resolvent resolvent;
- const std::tr1::shared_ptr<const Decision> previous_decision;
- const std::tr1::shared_ptr<const Constraint> problematic_constraint;
- const std::tr1::shared_ptr<const Decision> new_decision;
- const std::tr1::shared_ptr<const Constraint> suggested_preset;
+ const std::shared_ptr<const Decision> previous_decision;
+ const std::shared_ptr<const Constraint> problematic_constraint;
+ const std::shared_ptr<const Decision> new_decision;
+ const std::shared_ptr<const Constraint> suggested_preset;
Implementation(const Resolvent & q,
- const std::tr1::shared_ptr<const Decision> & pd,
- const std::tr1::shared_ptr<const Constraint> & pc,
- const std::tr1::shared_ptr<const Decision> & nd,
- const std::tr1::shared_ptr<const Constraint> & nc
+ const std::shared_ptr<const Decision> & pd,
+ const std::shared_ptr<const Constraint> & pc,
+ const std::shared_ptr<const Decision> & nd,
+ const std::shared_ptr<const Constraint> & nc
) :
resolvent(q),
previous_decision(pd),
@@ -54,10 +54,10 @@ namespace paludis
}
SuggestRestart::SuggestRestart(const Resolvent & q,
- const std::tr1::shared_ptr<const Decision> & pd,
- const std::tr1::shared_ptr<const Constraint> & pc,
- const std::tr1::shared_ptr<const Decision> & nd,
- const std::tr1::shared_ptr<const Constraint> & nc
+ const std::shared_ptr<const Decision> & pd,
+ const std::shared_ptr<const Constraint> & pc,
+ const std::shared_ptr<const Decision> & nd,
+ const std::shared_ptr<const Constraint> & nc
) throw () :
PrivateImplementationPattern<SuggestRestart>(new Implementation<SuggestRestart>(q, pd, pc, nd, nc)),
Exception("Suggesting restart with " + stringify(nc->spec()) + " for " + stringify(q))
@@ -82,25 +82,25 @@ SuggestRestart::resolvent() const
return _imp->resolvent;
}
-const std::tr1::shared_ptr<const Decision>
+const std::shared_ptr<const Decision>
SuggestRestart::previous_decision() const
{
return _imp->previous_decision;
}
-const std::tr1::shared_ptr<const Constraint>
+const std::shared_ptr<const Constraint>
SuggestRestart::problematic_constraint() const
{
return _imp->problematic_constraint;
}
-const std::tr1::shared_ptr<const Decision>
+const std::shared_ptr<const Decision>
SuggestRestart::new_decision() const
{
return _imp->new_decision;
}
-const std::tr1::shared_ptr<const Constraint>
+const std::shared_ptr<const Constraint>
SuggestRestart::suggested_preset() const
{
return _imp->suggested_preset;
diff --git a/paludis/resolver/suggest_restart.hh b/paludis/resolver/suggest_restart.hh
index a261a0477..047cfcd40 100644
--- a/paludis/resolver/suggest_restart.hh
+++ b/paludis/resolver/suggest_restart.hh
@@ -39,18 +39,18 @@ namespace paludis
public:
SuggestRestart(
const Resolvent &,
- const std::tr1::shared_ptr<const Decision> & previous_decision,
- const std::tr1::shared_ptr<const Constraint> & problematic_constraint,
- const std::tr1::shared_ptr<const Decision> & new_decision,
- const std::tr1::shared_ptr<const Constraint> & suggested_preset) throw ();
+ const std::shared_ptr<const Decision> & previous_decision,
+ const std::shared_ptr<const Constraint> & problematic_constraint,
+ const std::shared_ptr<const Decision> & new_decision,
+ const std::shared_ptr<const Constraint> & suggested_preset) throw ();
SuggestRestart(const SuggestRestart &);
~SuggestRestart() throw ();
const Resolvent resolvent() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Decision> previous_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Constraint> problematic_constraint() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Decision> new_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
- const std::tr1::shared_ptr<const Constraint> suggested_preset() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Decision> previous_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Constraint> problematic_constraint() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Decision> new_decision() const PALUDIS_ATTRIBUTE((warn_unused_result));
+ const std::shared_ptr<const Constraint> suggested_preset() const PALUDIS_ATTRIBUTE((warn_unused_result));
};
}
diff --git a/paludis/resolver/unsuitable_candidates.cc b/paludis/resolver/unsuitable_candidates.cc
index 6dc4b9e9e..bcc92493e 100644
--- a/paludis/resolver/unsuitable_candidates.cc
+++ b/paludis/resolver/unsuitable_candidates.cc
@@ -35,8 +35,8 @@ UnsuitableCandidate::deserialise(Deserialisation & d)
{
Deserialisator v(d, "UnsuitableCandidate");
return make_named_values<UnsuitableCandidate>(
- n::package_id() = v.member<std::tr1::shared_ptr<const PackageID> >("package_id"),
- n::unmet_constraints() = v.member<std::tr1::shared_ptr<Constraints> >("unmet_constraints")
+ n::package_id() = v.member<std::shared_ptr<const PackageID> >("package_id"),
+ n::unmet_constraints() = v.member<std::shared_ptr<Constraints> >("unmet_constraints")
);
}
diff --git a/paludis/resolver/unsuitable_candidates.hh b/paludis/resolver/unsuitable_candidates.hh
index 038ad7690..25b051290 100644
--- a/paludis/resolver/unsuitable_candidates.hh
+++ b/paludis/resolver/unsuitable_candidates.hh
@@ -38,8 +38,8 @@ namespace paludis
{
struct UnsuitableCandidate
{
- NamedValue<n::package_id, std::tr1::shared_ptr<const PackageID> > package_id;
- NamedValue<n::unmet_constraints, std::tr1::shared_ptr<const Constraints> > unmet_constraints;
+ NamedValue<n::package_id, std::shared_ptr<const PackageID> > package_id;
+ NamedValue<n::unmet_constraints, std::shared_ptr<const Constraints> > unmet_constraints;
static UnsuitableCandidate deserialise(Deserialisation &) PALUDIS_ATTRIBUTE((warn_unused_result));
void serialise(Serialiser &) const;