From df687837f822352de3a052b0abc8e1976c583aef Mon Sep 17 00:00:00 2001 From: lazydodo Date: Mon, 28 Nov 2016 10:12:21 -0700 Subject: [PATCH] [msvc2017] remove eigen vector workaround for msvc2017. --- extern/Eigen3/Eigen/src/StlSupport/StdVector.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extern/Eigen3/Eigen/src/StlSupport/StdVector.h b/extern/Eigen3/Eigen/src/StlSupport/StdVector.h index 611664a2e8a..1894af6b779 100644 --- a/extern/Eigen3/Eigen/src/StlSupport/StdVector.h +++ b/extern/Eigen3/Eigen/src/StlSupport/StdVector.h @@ -77,7 +77,7 @@ namespace std { void resize(size_type new_size) { resize(new_size, T()); } -#if defined(_VECTOR_) +#if defined(_VECTOR_) && (_MSC_VER<1910) // workaround MSVC std::vector implementation void resize(size_type new_size, const value_type& x) { @@ -110,7 +110,7 @@ namespace std { vector_base::insert(vector_base::end(), new_size - vector_base::size(), x); } #else - // either GCC 4.1 or non-GCC + // either GCC 4.1, MSVC2017 or non-GCC // default implementation which should always work. void resize(size_type new_size, const value_type& x) {