Commit: df687837f822352de3a052b0abc8e1976c583aef
Author: lazydodo
Date: Mon Nov 28 10:12:21 2016 -0700
Branches: master
https://developer.blender.org/rBdf687837f822352de3a052b0abc8e1976c583aef
[msvc2017] remove eigen vector workaround for msvc2017.
===================================================================
M extern/Eigen3/Eigen/src/StlSupport/StdVector.h
===================================================================
diff --git a/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
b/extern/Eigen3/Eigen/src/StlSupport/StdVector.h
index 611664a..1894af6 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)
{
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
