GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-12 11:49:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make EIGEN_HAS_STD_RESULT_OF user configurable

Browse Source
This commit is contained in:
Gael Guennebaud 2016-05-20 15:01:27 +02:00
parent 1395056fc0
commit abd1c1af7a
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Eigen/src/Core/util/Macros.h
View File

@ -372,8 +372,12 @@
#endif #endif
// Does the compiler support result_of? // Does the compiler support result_of?
#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)))
#define EIGEN_HAS_STD_RESULT_OF 1 #define EIGEN_HAS_STD_RESULT_OF 1
#else
#define EIGEN_HAS_STD_RESULT_OF 0
#endif
#endif #endif
// Does the compiler support variadic templates? // Does the compiler support variadic templates?

2
Eigen/src/Core/util/Meta.h
View File

@ -254,7 +254,7 @@ protected:
* upcoming next STL generation (using a templated result member). * upcoming next STL generation (using a templated result member).
* If none of these members is provided, then the type of the first argument is returned. FIXME, that behavior is a pretty bad hack. * If none of these members is provided, then the type of the first argument is returned. FIXME, that behavior is a pretty bad hack.
*/ */
#ifdef EIGEN_HAS_STD_RESULT_OF #if EIGEN_HAS_STD_RESULT_OF
template<typename T> struct result_of { template<typename T> struct result_of {
typedef typename std::result_of<T>::type type1; typedef typename std::result_of<T>::type type1;
typedef typename remove_all<type1>::type type; typedef typename remove_all<type1>::type type;

2
test/mixingtypes.cpp
View File

@ -57,7 +57,7 @@ template<int SizeAtCompileType> void mixingtypes(int size = SizeAtCompileType)
mf+mf; mf+mf;
VERIFY_RAISES_ASSERT(mf+md); VERIFY_RAISES_ASSERT(mf+md);
#ifndef EIGEN_HAS_STD_RESULT_OF #if !EIGEN_HAS_STD_RESULT_OF
// this one does not even compile with C++11 // this one does not even compile with C++11
VERIFY_RAISES_ASSERT(mf+mcf); VERIFY_RAISES_ASSERT(mf+mcf);
#endif #endif