diff --git a/src/core/model/attribute-container.h b/src/core/model/attribute-container.h
index bb9c4bd22..7f59b53e3 100644
--- a/src/core/model/attribute-container.h
+++ b/src/core/model/attribute-container.h
@@ -68,7 +68,7 @@ public:
 
   // use underlying AttributeValue to get return element type
   /** Item type of container returned by Get. */
-  typedef typename std::result_of<decltype(&A::Get)(A)>::type item_type;
+  typedef typename std::invoke_result_t<decltype(&A::Get), A> item_type;
   /** Type of container returned. */
   typedef C<item_type> result_type;
 
diff --git a/src/core/model/pair.h b/src/core/model/pair.h
index 36e60de8f..465b2706a 100644
--- a/src/core/model/pair.h
+++ b/src/core/model/pair.h
@@ -58,9 +58,9 @@ public:
   /** Type of value stored in the PairValue. */
   typedef std::pair<Ptr<A>, Ptr<B> > value_type;
   /** Type of abscissa (first entry of pair). */
-  typedef typename std::result_of<decltype(&A::Get)(A)>::type first_type;
+  typedef typename std::invoke_result_t<decltype(&A::Get), A> first_type;
   /** Type of ordinal (second entry of pair). */
-  typedef typename std::result_of<decltype(&B::Get)(B)>::type second_type;
+  typedef typename std::invoke_result_t<decltype(&B::Get), B> second_type;
   /** Type returned by Get or passed in Set. */
   typedef typename std::pair<first_type, second_type> result_type;