mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-14 13:30:48 +03:00
0024234: occt master is not compiled by VC++ 2005 (vc8 32/64 bit TKBO)
Fixed building by VS 2005 and VS 2013 (Express): - macro _WIN32_WINNT defined in BOPCol_TBB.hxx for building with TBB on VS 2005 - compiler warnings specific for VS 2005 (vc8) fixed (explicit casts added in assignment expressions involving small integer types) - definition of functions atanh, acosh, asinh is avoided for vc12 and later (they are provided by CRT in vc12) - math constants (M_PI and similar) are defined by including math.h rather than by custom code - misuse of stream operator << fixed in a few places
This commit is contained in:
@@ -21,6 +21,13 @@
|
||||
|
||||
#ifdef HAVE_TBB
|
||||
|
||||
// On Windows, function TryEnterCriticalSection has appeared in Windows NT
|
||||
// and is surrounded by #ifdef in MS VC++ 7.1 headers.
|
||||
// Thus to use it we need to define appropriate macro saying that we wil
|
||||
// run on Windows NT 4.0 at least
|
||||
#if ((defined(_WIN32) || defined(__WIN32__)) && !defined(_WIN32_WINNT))
|
||||
#define _WIN32_WINNT 0x0501
|
||||
#endif
|
||||
|
||||
#include <tbb/tbb.h>
|
||||
using namespace tbb;
|
||||
@@ -28,7 +35,6 @@ using namespace tbb;
|
||||
#define flexible_range blocked_range
|
||||
#define flexible_for parallel_for
|
||||
|
||||
|
||||
#else // not HAVE_TBB
|
||||
|
||||
#define flexible_range serial_range
|
||||
|
Reference in New Issue
Block a user