diff --git a/src/util/range.h b/src/util/range.h
index c714cdb0464..d884e7635fe 100644
--- a/src/util/range.h
+++ b/src/util/range.h
@@ -418,11 +418,9 @@ struct ranget final
   /// a value through `f`. `f` may take a move-only typed parameter by const
   /// reference. 'f' may also construct and return a move-only typed value.
   template <typename functiont>
-  auto map(functiont &&f) -> ranget<map_iteratort<
-    iteratort,
-    typename std::result_of<functiont(value_type)>::type>>
+  auto map(functiont &&f)
   {
-    using outputt = typename std::result_of<functiont(value_type)>::type;
+    using outputt = typename std::invoke_result<functiont, value_type>::type;
     auto shared_f = std::make_shared<
       std::function<outputt(const typename iteratort::value_type &)>>(
       std::forward<functiont>(f));