diff options
| author |  Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-20 10:36:32 -0500 |
|---|---|---|
| committer | Benoit Jacob <jacob.benoit.1@gmail.com> | 2011-01-20 10:36:32 -0500 |
| commit | 34d93686db8f2df73b9bd7398ba841b11fbc3a7f (patch) | |
| tree | b11bf509fc049156965fce78adea49f4f12017ac /Eigen/src/Core/util | |
| parent | 66a2ffa9bdcaf97fcc7dbcf0cb882d58f49a7483 (diff) | |
lots more EIGEN2_SUPPORT fixes. Now several of the most important core tests build and succeed.
Diffstat (limited to 'Eigen/src/Core/util')
| -rw-r--r-- | Eigen/src/Core/util/StaticAssert.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Eigen/src/Core/util/StaticAssert.h b/Eigen/src/Core/util/StaticAssert.h index d72a182e5..5f9bd1339 100644 --- a/Eigen/src/Core/util/StaticAssert.h +++ b/Eigen/src/Core/util/StaticAssert.h @@ -171,8 +171,14 @@ ) \ ) -#define EIGEN_STATIC_ASSERT_NON_INTEGER(TYPE) \ - EIGEN_STATIC_ASSERT(!NumTraits<TYPE>::IsInteger, THIS_FUNCTION_IS_NOT_FOR_INTEGER_NUMERIC_TYPES) +#ifdef EIGEN2_SUPPORT + #define EIGEN_STATIC_ASSERT_NON_INTEGER(TYPE) \ + eigen_assert(!NumTraits<Scalar>::IsInteger); +#else + #define EIGEN_STATIC_ASSERT_NON_INTEGER(TYPE) \ + EIGEN_STATIC_ASSERT(!NumTraits<TYPE>::IsInteger, THIS_FUNCTION_IS_NOT_FOR_INTEGER_NUMERIC_TYPES) +#endif + // static assertion failing if it is guaranteed at compile-time that the two matrix expression types have different sizes #define EIGEN_STATIC_ASSERT_SAME_MATRIX_SIZE(TYPE0,TYPE1) \ |