std::result of is deprecated in C++17 (#3244)

libMesh · Jun 30, 2022 · 7f4c641 · 7f4c641
1 parent 86f353f
commit 7f4c641
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/contrib/eigen/3.3.9/Eigen/src/Core/util/Macros.h b/contrib/eigen/3.3.9/Eigen/src/Core/util/Macros.h
@@ -388,9 +388,9 @@
 #endif
 #endif
 
-// Does the compiler support result_of?
+// Does the compiler support result_of? (patched for libmesh as std::result gets deprecated in C++17)
 #ifndef EIGEN_HAS_STD_RESULT_OF
-#if EIGEN_MAX_CPP_VER>=11 && ((__has_feature(cxx_lambdas) || (defined(__cplusplus) && __cplusplus >= 201103L)))
+#if EIGEN_MAX_CPP_VER>=11 && ((__has_feature(cxx_lambdas) || (defined(__cplusplus) && __cplusplus >= 201103L && __cplusplus < 201703L)))
 #define EIGEN_HAS_STD_RESULT_OF 1
 #else
 #define EIGEN_HAS_STD_RESULT_OF 0