From 9ad13d70faff0c510c313a7d58a58b974e8ce11f Mon Sep 17 00:00:00 2001 From: Martijn Berger Date: Thu, 10 Dec 2015 12:37:46 +0100 Subject: Update Eigen to version 3.2.7 The main purpose of this is to get MSVC 2015 fixes --- extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h') diff --git a/extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h b/extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h index 17fff96a78b..220c6451cb9 100644 --- a/extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h +++ b/extern/Eigen3/Eigen/src/SparseCore/AmbiVector.h @@ -69,7 +69,7 @@ class AmbiVector delete[] m_buffer; if (size<1000) { - Index allocSize = (size * sizeof(ListEl))/sizeof(Scalar); + Index allocSize = (size * sizeof(ListEl) + sizeof(Scalar) - 1)/sizeof(Scalar); m_allocatedElements = (allocSize*sizeof(Scalar))/sizeof(ListEl); m_buffer = new Scalar[allocSize]; } @@ -88,7 +88,7 @@ class AmbiVector Index copyElements = m_allocatedElements; m_allocatedElements = (std::min)(Index(m_allocatedElements*1.5),m_size); Index allocSize = m_allocatedElements * sizeof(ListEl); - allocSize = allocSize/sizeof(Scalar) + (allocSize%sizeof(Scalar)>0?1:0); + allocSize = (allocSize + sizeof(Scalar) - 1)/sizeof(Scalar); Scalar* newBuffer = new Scalar[allocSize]; memcpy(newBuffer, m_buffer, copyElements * sizeof(ListEl)); delete[] m_buffer; -- cgit v1.2.3