diff options
| -rw-r--r-- | paludis/repositories/e/e_choice_value.cc | 27 | ||||
| -rw-r--r-- | paludis/resolver/decider.cc | 3 | ||||
| -rw-r--r-- | paludis/util/sequence-impl.hh | 2 | ||||
| -rw-r--r-- | paludis/util/visitor.hh | 2 | ||||
| -rw-r--r-- | python/dep_spec.cc | 7 | ||||
| -rw-r--r-- | python/exception.cc | 5 | ||||
| -rw-r--r-- | ruby/paludis_ruby.cc | 5 |
7 files changed, 31 insertions, 20 deletions
diff --git a/paludis/repositories/e/e_choice_value.cc b/paludis/repositories/e/e_choice_value.cc index 342e10daf..f1abf5b4d 100644 --- a/paludis/repositories/e/e_choice_value.cc +++ b/paludis/repositories/e/e_choice_value.cc @@ -144,19 +144,22 @@ namespace paludis } }; - bool operator== (const EChoiceValueParams & a, const EChoiceValueParams & b) + namespace erepository { - return true - && (a.choice_name_with_prefix() == b.choice_name_with_prefix()) - && (a.choice_prefix_name() == b.choice_prefix_name()) - && (a.description() == b.description()) - && (a.enabled() == b.enabled()) - && (a.enabled_by_default() == b.enabled_by_default()) - && (a.origin() == b.origin()) - && (a.locked() == b.locked()) - && (a.presumed() == b.presumed()) - && (a.unprefixed_choice_name() == b.unprefixed_choice_name()) - ; + bool operator== (const EChoiceValueParams & a, const EChoiceValueParams & b) + { + return true + && (a.choice_name_with_prefix() == b.choice_name_with_prefix()) + && (a.choice_prefix_name() == b.choice_prefix_name()) + && (a.description() == b.description()) + && (a.enabled() == b.enabled()) + && (a.enabled_by_default() == b.enabled_by_default()) + && (a.origin() == b.origin()) + && (a.locked() == b.locked()) + && (a.presumed() == b.presumed()) + && (a.unprefixed_choice_name() == b.unprefixed_choice_name()) + ; + } } } diff --git a/paludis/resolver/decider.cc b/paludis/resolver/decider.cc index f2a7f115f..010139801 100644 --- a/paludis/resolver/decider.cc +++ b/paludis/resolver/decider.cc @@ -933,8 +933,7 @@ Decider::_made_wrong_decision( adapted_resolution, _imp->fns.allow_choice_changes_fn()(resolution), false, true, false, true)); if (decision) { - resolution->decision()->accept(WrongDecisionVisitor(std::bind( - &Decider::_suggest_restart_with, this, resolution, constraint, decision))); + resolution->decision()->accept(WrongDecisionVisitor([&] () { _suggest_restart_with(resolution, constraint, decision); })); resolution->decision() = decision; } else diff --git a/paludis/util/sequence-impl.hh b/paludis/util/sequence-impl.hh index f1ae381ac..b8b130155 100644 --- a/paludis/util/sequence-impl.hh +++ b/paludis/util/sequence-impl.hh @@ -159,7 +159,7 @@ template <typename C_> void paludis::Sequence<T_>::sort(const C_ & c) { - _imp->list.sort<const C_ &>(c); + _imp->list.template sort<const C_ &>(c); } #endif diff --git a/paludis/util/visitor.hh b/paludis/util/visitor.hh index 19b3d0b6b..a49776e8e 100644 --- a/paludis/util/visitor.hh +++ b/paludis/util/visitor.hh @@ -135,7 +135,7 @@ namespace paludis }; template <typename T_> - using CallResultType = typename ExtractResultType<decltype(&T_::operator())>::Type; + using CallResultType = typename std::remove_const<typename ExtractResultType<decltype(&T_::operator())>::Type>::type; template <typename Revisitor_, typename Result_, typename... Cases_> struct MadeVisitor; diff --git a/python/dep_spec.cc b/python/dep_spec.cc index 2bee02bf0..26cfa030d 100644 --- a/python/dep_spec.cc +++ b/python/dep_spec.cc @@ -1406,6 +1406,9 @@ void expose_dep_spec() ; } -template class WrappedForwardIterator<PythonCompositeDepSpec::ConstIteratorTag, - const std::shared_ptr<const PythonDepSpec> >; +namespace paludis +{ + template class WrappedForwardIterator<PythonCompositeDepSpec::ConstIteratorTag, + const std::shared_ptr<const PythonDepSpec> >; +} diff --git a/python/exception.cc b/python/exception.cc index bf4fd190e..b796348c1 100644 --- a/python/exception.cc +++ b/python/exception.cc @@ -29,7 +29,10 @@ using namespace paludis; using namespace paludis::python; namespace bp = boost::python; -template class Singleton<ExceptionRegister>; +namespace paludis +{ + template class Singleton<ExceptionRegister>; +} RegisteredExceptionBase::~RegisteredExceptionBase() { diff --git a/ruby/paludis_ruby.cc b/ruby/paludis_ruby.cc index d58a8d07e..4cb575a4f 100644 --- a/ruby/paludis_ruby.cc +++ b/ruby/paludis_ruby.cc @@ -35,7 +35,10 @@ using namespace paludis; using namespace paludis::ruby; -template class Singleton<RegisterRubyClass>; +namespace paludis +{ + template class Singleton<RegisterRubyClass>; +} namespace paludis { |