Proper invoke_result_t.

arbor-sim · Sep 10, 2024 · 097938d · 097938d
1 parent 72e9fbe
commit 097938d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git 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 <typename F>
-    std::invoke_result_t<F(reference)> apply(F&& f) { return f(ref()); }
+    std::invoke_result_t<F, reference> apply(F&& f) { return f(ref()); }
 
     // Apply the one-parameter functor F to the value by const reference.
     template <typename F>
-    std::invoke_result_t<F(const_reference)> apply(F&& f) const { return f(cref()); }
+    std::invoke_result_t<F, const_reference> apply(F&& f) const { return f(cref()); }
 };
 
 /*

diff --git 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<std::invoke_result<Proj (typename sequence_traits<const Seq&>::value_type)>>
->
+template <typename Seq,
+          typename Proj,
+          typename Compare = std::less<std::invoke_result_t<Proj, typename sequence_traits<const Seq&>::value_type>>>
 bool is_sorted_by(const Seq& seq, const Proj& proj, Compare cmp = Compare{}) {
     using std::begin;
     using std::end;