[Bf-blender-cvs] [e9825ad] master: MSVC 2015 fix hack around internal compiler crash on openmp atomic

Martijn Berger noreply at git.blender.org
Thu Dec 10 15:01:23 CET 2015


Commit: e9825ad9f34c12b36ad75237102fdcbe8c2369d4
Author: Martijn Berger
Date:   Thu Dec 10 14:59:17 2015 +0100
Branches: master
https://developer.blender.org/rBe9825ad9f34c12b36ad75237102fdcbe8c2369d4

MSVC 2015 fix hack around internal compiler crash on openmp atomic

Eigen3 bug report: http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1131

===================================================================

M	extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h

===================================================================

diff --git a/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h b/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
index 3f5ffcf..a36c7c7 100644
--- a/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
+++ b/extern/Eigen3/Eigen/src/Core/products/GeneralMatrixMatrix.h
@@ -140,8 +140,14 @@ static void run(Index rows, Index cols, Index depth,
       // Release all the sub blocks B'_j of B' for the current thread,
       // i.e., we simply decrement the number of users by 1
       for(Index j=0; j<threads; ++j)
+      {
         #pragma omp atomic
+#if defined(_MSC_VER) && _MSC_VER >= 1900
+		(info[j].users) -= 1;
+#else
         --(info[j].users);
+#endif
+      }
     }
   }
   else




More information about the Bf-blender-cvs mailing list