diff options
author | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:16:13 +0300 |
---|---|---|
committer | Lukas Tönne <lukas.toenne@gmail.com> | 2017-10-16 12:22:35 +0300 |
commit | a78b3ee53aa53020b086a6df25c0e28491223dcc (patch) | |
tree | bd883e95580f5777f7eae7cac4e47f182ac9fc00 /extern/Eigen3/Eigen/src/StlSupport | |
parent | 4842cc017c3bb7df2070c2f96605190ff88e6a2e (diff) | |
parent | 49f4ac17bf704614de59a4db7a65c205c085d694 (diff) |
Merge remote-tracking branch 'origin/master' into openvdbopenvdb
Diffstat (limited to 'extern/Eigen3/Eigen/src/StlSupport')
-rw-r--r-- | extern/Eigen3/Eigen/src/StlSupport/StdVector.h | 4 |
1 files 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) { |