Merge pull request #1721 from LLNL/bugfix/result_of

rhornung67 · web-flow · commit 1ca471117c2e · 2025-11-12T13:05:00.000-08:00
Use std::invoke_result_t instead of deprecated/removed std::result_of
diff --git a/src/axom/spin/ImplicitGrid.hpp b/src/axom/spin/ImplicitGrid.hpp
@@ -16,6 +16,7 @@
 #include "axom/primal/geometry/Vector.hpp"
 #include "axom/spin/RectangularLattice.hpp"
 
+#include <type_traits>
 #include <vector>
 
 namespace axom
@@ -708,7 +709,7 @@ struct ImplicitGrid<NDIMS, ExecSpace, IndexType>::QueryObject
   template <typename FuncType>
   AXOM_HOST_DEVICE bool getVisitResult(FuncType&& type, int arg) const
   {
-    using ReturnType = typename std::result_of<FuncType(int)>::type;
+    using ReturnType = std::invoke_result_t<FuncType, int>;
     return VisitDispatch<FuncType, ReturnType>::getResult(type, arg);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@`
`16`	`16`	`#include "axom/primal/geometry/Vector.hpp"`
`17`	`17`	`#include "axom/spin/RectangularLattice.hpp"`
`18`	`18`
	`19`	`+#include <type_traits>`
`19`	`20`	`#include <vector>`
`20`	`21`
`21`	`22`	`namespace axom`
`@@ -708,7 +709,7 @@ struct ImplicitGrid<NDIMS, ExecSpace, IndexType>::QueryObject`
`708`	`709`	`template <typename FuncType>`
`709`	`710`	`AXOM_HOST_DEVICE bool getVisitResult(FuncType&& type, int arg) const`
`710`	`711`	`{`
`711`		`- using ReturnType = typename std::result_of<FuncType(int)>::type;`
	`712`	`+ using ReturnType = std::invoke_result_t<FuncType, int>;`
`712`	`713`	`return VisitDispatch<FuncType, ReturnType>::getResult(type, arg);`
`713`	`714`	`}`
`714`	`715`