diff options
| author |  Rasmus Munk Larsen <rmlarsen@google.com> | 2016-02-06 16:36:56 -0800 |
|---|---|---|
| committer | Rasmus Munk Larsen <rmlarsen@google.com> | 2016-02-06 16:36:56 -0800 |
| commit | 86d6201d7b615a2ee7f48d729fe4fad28f3242c5 (patch) | |
| tree | e75da351955b7b372ecdc2292bbf961253c0cee6 /test | |
| parent | d904c8ac8f5963b0c6f2528f4ee1823350277713 (diff) | |
| parent | 010afe1619c9200b885f74d3c3937e000ec76b1d (diff) | |
Merge.
Diffstat (limited to 'test')
| -rw-r--r-- | test/dynalloc.cpp | 6 | ||||
| -rw-r--r-- | test/mapped_matrix.cpp | 2 | ||||
| -rw-r--r-- | test/zerosized.cpp | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/test/dynalloc.cpp b/test/dynalloc.cpp index 6f22e1ab4..5f587007c 100644 --- a/test/dynalloc.cpp +++ b/test/dynalloc.cpp @@ -31,7 +31,7 @@ void check_handmade_aligned_malloc() void check_aligned_malloc() { - for(int i = 1; i < 1000; i++) + for(int i = ALIGNMENT; i < 1000; i++) { char *p = (char*)internal::aligned_malloc(i); VERIFY(size_t(p)%ALIGNMENT==0); @@ -43,7 +43,7 @@ void check_aligned_malloc() void check_aligned_new() { - for(int i = 1; i < 1000; i++) + for(int i = ALIGNMENT; i < 1000; i++) { float *p = internal::aligned_new<float>(i); VERIFY(size_t(p)%ALIGNMENT==0); @@ -55,7 +55,7 @@ void check_aligned_new() void check_aligned_stack_alloc() { - for(int i = 1; i < 400; i++) + for(int i = ALIGNMENT; i < 400; i++) { ei_declare_aligned_stack_constructed_variable(float,p,i,0); VERIFY(size_t(p)%ALIGNMENT==0); diff --git a/test/mapped_matrix.cpp b/test/mapped_matrix.cpp index 7c7099792..88653e887 100644 --- a/test/mapped_matrix.cpp +++ b/test/mapped_matrix.cpp @@ -40,7 +40,7 @@ template<typename VectorType> void map_class_vector(const VectorType& m) VERIFY_IS_EQUAL(ma1, ma3); VERIFY_IS_EQUAL(ma1, ma4); #ifdef EIGEN_VECTORIZE - if(internal::packet_traits<Scalar>::Vectorizable) + if(internal::packet_traits<Scalar>::Vectorizable && size>=AlignedMax) VERIFY_RAISES_ASSERT((Map<VectorType,AlignedMax>(array3unaligned, size))) #endif diff --git a/test/zerosized.cpp b/test/zerosized.cpp index 85c553453..2404fdc2b 100644 --- a/test/zerosized.cpp +++ b/test/zerosized.cpp @@ -49,8 +49,8 @@ template<typename MatrixType> void zeroSizedMatrix() if(MatrixType::MaxColsAtCompileTime!=0 && MatrixType::MaxRowsAtCompileTime!=0) { - Index rows = MatrixType::RowsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : MatrixType::RowsAtCompileTime; - Index cols = MatrixType::ColsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : MatrixType::ColsAtCompileTime; + Index rows = MatrixType::RowsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : Index(MatrixType::RowsAtCompileTime); + Index cols = MatrixType::ColsAtCompileTime==Dynamic ? internal::random<Index>(1,10) : Index(MatrixType::ColsAtCompileTime); MatrixType m(rows,cols); zeroReduction(m.template block<0,MatrixType::ColsAtCompileTime>(0,0,0,cols)); zeroReduction(m.template block<MatrixType::RowsAtCompileTime,0>(0,0,rows,0)); |