Add library for concurremcy in >= VS2015

revert conditional in Points.cpp (i.e. reactivate parallel handling)
This commit is contained in:
hgutsche
2018-08-09 21:10:22 -04:00
committed by wmayer
parent 3c2e27cfc2
commit a097804cbd
2 changed files with 3 additions and 1 deletions

View File

@@ -37,8 +37,10 @@ if(MSVC)
list(APPEND FreeCADBase_LIBS
debug vcruntimed.lib
debug ucrtd.lib
debug concrtd.lib
optimized vcruntime.lib
optimized ucrt.lib
optimized concrt.lib
)
endif()
elseif(MINGW)

View File

@@ -88,7 +88,7 @@ Base::BoundBox3d PointKernel::getBoundBox(void)const
Base::BoundBox3d bnd;
//FIXME: VS 2015 or later causes a linker error
#if defined (_MSC_VER) && (_MSC_VER <= 1800)
#if defined _WIN32
// Thread-local bounding boxes
Concurrency::combinable<Base::BoundBox3d> bbs;
// Cannot use a const_point_iterator here as it is *not* a proper iterator (fails the for_each template)