diff --git a/dune/solvers/common/algorithm.hh b/dune/solvers/common/algorithm.hh index fc47a3b5f24780c20da07f7c9b047733a57f52a7..f9772781ca6d287f5d11b7f98fe9cf1afd0c08c3 100644 --- a/dune/solvers/common/algorithm.hh +++ b/dune/solvers/common/algorithm.hh @@ -56,11 +56,11 @@ struct IsIntegralConstant : public IsIntegralConstantHelper<std::decay_t<T>> // Compute t1==t2 either statically or dynamically template<class T1, class T2> -constexpr auto hybridEqual(const T1& t1, const T2& t2, PriorityTag<1>) -> decltype(T1::value, T2::value, std::integral_constant<bool,T1::value == T2::value>()) +constexpr auto hybridEquals(const T1& t1, const T2& t2, PriorityTag<1>) -> decltype(T1::value, T2::value, std::integral_constant<bool,T1::value == T2::value>()) { return {}; } template<class T1, class T2> -constexpr auto hybridEqual(const T1& t1, const T2& t2, PriorityTag<0>) +constexpr auto hybridEquals(const T1& t1, const T2& t2, PriorityTag<0>) { return t1==t2; } @@ -304,9 +304,9 @@ void sparseRangeFor(Range&& range, F&& f) * the result of a runtime comparison of t1 and t2 is directly returned. */ template<class T1, class T2> -constexpr auto hybridEqual(const T1& t1, const T2& t2) +constexpr auto hybridEquals(const T1& t1, const T2& t2) { - return Imp::hybridEqual(t1, t2, PriorityTag<1>()); + return Imp::hybridEquals(t1, t2, PriorityTag<1>()); }