Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlazydodo <github@lazydodo.com>2016-11-28 20:12:21 +0300
committerlazydodo <github@lazydodo.com>2016-11-28 20:12:21 +0300
commitdf687837f822352de3a052b0abc8e1976c583aef (patch)
treed3289cc2201b80cc99e444c098379f6bec880d00 /extern/Eigen3
parent3340acd46b6bb4ab34f16b1dcd25850c92b353c4 (diff)
[msvc2017] remove eigen vector workaround for msvc2017.
Diffstat (limited to 'extern/Eigen3')
-rw-r--r--extern/Eigen3/Eigen/src/StlSupport/StdVector.h4
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)
{