dune/curvedgeometry/localfunctiongeometry.hh

@@ -71,7 +71,7 @@ public:
   using LocalCoordinate = typename LG::LocalCoordinate;
 
   /// type of global coordinates
-  using GlobalCoordinate = std::invoke_result_t<LF,typename LG::GlobalCoordinate>;
+  using GlobalCoordinate = decltype(std::declval<LF>()(std::declval<typename LG::GlobalCoordinate>()));
 
   /// coordinate type
   using ctype = typename LocalCoordinate::value_type;

dune/curvedgeometry/parametrizedgeometry.hh

@@ -620,7 +620,7 @@ ParametrizedGeometry (Geo::ReferenceElement<I>, const LFE&, std::vector<GlobalCo
   -> ParametrizedGeometry<LFE, GlobalCoordinate::dimension>;
 
 template <class I, class LFE, class F,
-          class Range = std::result_of_t<F(Impl::LocalCoordinate_t<LFE>)>>
+          class Range = decltype(std::declval<F>()(std::declval<Impl::LocalCoordinate_t<LFE>>()))>
 ParametrizedGeometry (Geo::ReferenceElement<I>, const LFE&, const F&)
   -> ParametrizedGeometry<LFE, Range::dimension>;
 
@@ -629,7 +629,7 @@ ParametrizedGeometry (GeometryType, const LFE& localFE, std::vector<GlobalCoordi
   -> ParametrizedGeometry<LFE, GlobalCoordinate::dimension>;
 
 template <class LFE, class F,
-          class Range = std::result_of_t<F(Impl::LocalCoordinate_t<LFE>)>>
+          class Range = decltype(std::declval<F>()(std::declval<Impl::LocalCoordinate_t<LFE>>()))>
 ParametrizedGeometry (GeometryType, const LFE&, const F&)
   -> ParametrizedGeometry<LFE, Range::dimension>;
 

dune/curvedgeometry/test/test-localfunctiongeometry.cc

@@ -47,7 +47,7 @@ public:
 
   using Domain = typename Geometry::GlobalCoordinate;
   using LocalDomain = typename Geometry::LocalCoordinate;
-  using Range = std::result_of_t<Functor(Domain)>;
+  using Range = decltype(std::declval<Functor>()(std::declval<Domain>()));
   using Signature = Range(LocalDomain);
 
 public: