From ffee1d1c878b4906e7c8a14816aecee58be6252a Mon Sep 17 00:00:00 2001 From: Gael Guennebaud Date: Mon, 21 Mar 2011 21:59:42 +0100 Subject: [PATCH] fix 228 (ei_aligned_stack_delete does not exist anymore) (transplanted from 5fda8cdfb36a56288c54bd2f87bf596cb06b506a ) --- Eigen/src/Core/products/GeneralMatrixMatrix.h | 3 --- test/eigen2/eigen2_dynalloc.cpp | 3 +-- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Eigen/src/Core/products/GeneralMatrixMatrix.h b/Eigen/src/Core/products/GeneralMatrixMatrix.h index d558b4759..d33f00b20 100644 --- a/Eigen/src/Core/products/GeneralMatrixMatrix.h +++ b/Eigen/src/Core/products/GeneralMatrixMatrix.h @@ -155,9 +155,6 @@ static void run(Index rows, Index cols, Index depth, #pragma omp atomic --(info[j].users); } - - ei_aligned_stack_delete(LhsScalar, blockA, kc*mc); - ei_aligned_stack_delete(RhsScalar, w, sizeW); } else #endif // EIGEN_HAS_OPENMP diff --git a/test/eigen2/eigen2_dynalloc.cpp b/test/eigen2/eigen2_dynalloc.cpp index 1902b7c94..6a32ebb73 100644 --- a/test/eigen2/eigen2_dynalloc.cpp +++ b/test/eigen2/eigen2_dynalloc.cpp @@ -70,11 +70,10 @@ void check_aligned_stack_alloc() { for(int i = 1; i < 1000; i++) { - float *p = ei_aligned_stack_new(float,i); + ei_declare_aligned_stack_constructed_variable(float, p, i, 0); VERIFY(std::size_t(p)%ALIGNMENT==0); // if the buffer is wrongly allocated this will give a bad write --> check with valgrind for(int j = 0; j < i; j++) p[j]=0; - ei_aligned_stack_delete(float,p,i); } }