diff --git a/arbor/include/arbor/util/uninitialized.hpp b/arbor/include/arbor/util/uninitialized.hpp index 23320c1b1..f7d92eea5 100644 --- a/arbor/include/arbor/util/uninitialized.hpp +++ b/arbor/include/arbor/util/uninitialized.hpp @@ -74,11 +74,11 @@ class uninitialized { // Apply the one-parameter functor F to the value by reference. template - std::invoke_result_t apply(F&& f) { return f(ref()); } + std::invoke_result_t apply(F&& f) { return f(ref()); } // Apply the one-parameter functor F to the value by const reference. template - std::invoke_result_t apply(F&& f) const { return f(cref()); } + std::invoke_result_t apply(F&& f) const { return f(cref()); } }; /* diff --git a/arbor/util/rangeutil.hpp b/arbor/util/rangeutil.hpp index 59a6be0e6..2d08638ab 100644 --- a/arbor/util/rangeutil.hpp +++ b/arbor/util/rangeutil.hpp @@ -346,11 +346,9 @@ bool equal(const Seq1& seq1, const Seq2& seq2, Eq p = Eq{}) { // (TODO: this will perform unnecessary copies if `proj` returns a reference; // specialize on this if it becomes an issue.) -template < - typename Seq, - typename Proj, - typename Compare = std::less::value_type)>> -> +template ::value_type>>> bool is_sorted_by(const Seq& seq, const Proj& proj, Compare cmp = Compare{}) { using std::begin; using std::end;