diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2016-06-23 14:27:20 +0200 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2016-06-23 14:27:20 +0200 |
| commit | 76faf4a9657efeed089aeedc98a769410c32d3d7 (patch) | |
| tree | bbfe9d39d8e12ae5cd90ac8cbcb69a54ae81c953 /test/nesting_ops.cpp | |
| parent | 67c12531e567629e84713fbb3150560c916bd08c (diff) | |
Introduce a NumTraits<T>::Literal type to be used for literals, and
improve mixing type support in operations between arrays and scalars:
- 2 * ArrayXcf is now optimized in the sense that the integer 2 is properly promoted to a float instead of a complex<float> (fix a regression)
- 2.1 * ArrayXi is now forbiden (previously, 2.1 was converted to 2)
- This mechanism should be applicable to any custom scalar type, assuming NumTraits<T>::Literal is properly defined (it defaults to T)
Diffstat (limited to 'test/nesting_ops.cpp')
| -rw-r--r-- | test/nesting_ops.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/nesting_ops.cpp b/test/nesting_ops.cpp index 2f5025305..a419b0e44 100644 --- a/test/nesting_ops.cpp +++ b/test/nesting_ops.cpp @@ -75,8 +75,8 @@ template <typename MatrixType> void run_nesting_ops_2(const MatrixType& _m) } else { - VERIFY( verify_eval_type<1>(2*m1, 2*m1) ); - VERIFY( verify_eval_type<2>(2*m1, m1) ); + VERIFY( verify_eval_type<2>(2*m1, 2*m1) ); + VERIFY( verify_eval_type<3>(2*m1, m1) ); } VERIFY( verify_eval_type<2>(m1+m1, m1+m1) ); VERIFY( verify_eval_type<3>(m1+m1, m1) ); |