mirror of
https://git.dev.opencascade.org/repos/occt.git
synced 2025-08-04 13:13:25 +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:
@@ -20,31 +20,17 @@
|
||||
#include <Standard_Macro.hxx>
|
||||
#endif
|
||||
|
||||
#ifdef WNT
|
||||
#ifdef _MSC_VER
|
||||
|
||||
# ifndef __MATH_WNT_H
|
||||
# define __MATH_WNT_H
|
||||
#define _USE_MATH_DEFINES
|
||||
#include <math.h>
|
||||
|
||||
// MSVC versions prior to 12 did not provided acosh, asinh, atanh functions in standard library
|
||||
#if _MSC_VER < 1800
|
||||
__Standard_API double __cdecl acosh ( double );
|
||||
__Standard_API double __cdecl asinh ( double );
|
||||
__Standard_API double __cdecl atanh ( double );
|
||||
#endif
|
||||
|
||||
# ifdef M_SQRT1_2
|
||||
# undef M_SQRT1_2
|
||||
# endif
|
||||
# define M_SQRT1_2 0.707106781186547524401
|
||||
|
||||
# ifdef M_PI_2
|
||||
# undef M_PI_2
|
||||
# endif
|
||||
# define M_PI_2 1.57079632679489661923
|
||||
|
||||
# ifdef M_PI
|
||||
# undef M_PI
|
||||
# endif
|
||||
# define M_PI 3.14159265358979323846
|
||||
|
||||
# endif /* __MATH_WNT_H */
|
||||
|
||||
#endif /* WNT */
|
||||
#endif /* _MSC_VER */
|
||||
|
||||
|
Reference in New Issue
Block a user