diff options
| author |  Antonio Sanchez <cantonios@google.com> | 2021-02-17 11:59:33 -0800 |
|---|---|---|
| committer |  Rasmus Munk Larsen <rmlarsen@google.com> | 2021-02-24 21:36:14 +0000 |
| commit | a31effc3bca2f0924752caeebfd6f61f7edf9a43 (patch) | |
| tree | da21b842892e0e8f793756969e7840d71b3e1aa7 /Eigen/src/Core/util/Macros.h | |
| parent | 8523d447a137f20de5485fbdd28aafc3d0774153 (diff) | |
Add `invoke_result` and eliminate `result_of` warnings for C++17+.
The `std::result_of` meta struct is deprecated in C++17 and removed
in C++20. It was still slipping through due to a faulty definition of
`EIGEN_HAS_STD_RESULT_OF`.
Added a new macro `EIGEN_HAS_STD_INVOKE_RESULT` and
`Eigen::internal::invoke_result` implementation with fallback for
pre C++17.
Replaces the `result_of` definition with one based on `std::invoke_result`
for C++17 and higher.
For completeness, added nullary op support for c++03.
Fixes #1850.
Diffstat (limited to 'Eigen/src/Core/util/Macros.h')
| -rw-r--r-- | Eigen/src/Core/util/Macros.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/Macros.h b/Eigen/src/Core/util/Macros.h index 04e8e4d1e..b39c6ca43 100644 --- a/Eigen/src/Core/util/Macros.h +++ b/Eigen/src/Core/util/Macros.h @@ -660,8 +660,7 @@ // result_of was deprecated in c++17 and removed in c++ 20 #ifndef EIGEN_HAS_STD_RESULT_OF #if EIGEN_MAX_CPP_VER >= 11 && \ - ((defined(__cplusplus) && __cplusplus >= 201103L && __cplusplus < 201703L) || \ - __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 @@ -679,6 +678,15 @@ #endif #endif // EIGEN_HAS_STD_HASH +#ifndef EIGEN_HAS_STD_INVOKE_RESULT +#if EIGEN_MAX_CPP_VER >= 17 && \ + (defined(__cplusplus) && __cplusplus >= 201703L) +#define EIGEN_HAS_STD_INVOKE_RESULT 1 +#else +#define EIGEN_HAS_STD_INVOKE_RESULT 0 +#endif +#endif + #ifndef EIGEN_HAS_ALIGNAS #if EIGEN_MAX_CPP_VER>=11 && EIGEN_HAS_CXX11 && \ ( __has_feature(cxx_alignas) \ |