diff options
| author | Matthew Casey <mdcasey@chabloom.com> | 2014-02-11 14:19:52 -0500 |
|---|---|---|
| committer | Matthew Casey <mdcasey@chabloom.com> | 2014-02-11 14:19:52 -0500 |
| commit | 0bb71e723fe63ef95e6a68bd7faf186c6a7d0e32 (patch) | |
| tree | e4a0e6665454cb5924839ae0e3d957dcd19ff1e3 /core/math | |
| parent | 1adc330b68b1f6ca18aac05daf88c7d4d757fd0a (diff) | |
Make math_funcs.h use lrint on msvc 2013
Diffstat (limited to 'core/math')
| -rw-r--r-- | core/math/math_funcs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/core/math/math_funcs.h b/core/math/math_funcs.h index 6a60a7f790..c98a088912 100644 --- a/core/math/math_funcs.h +++ b/core/math/math_funcs.h @@ -136,7 +136,7 @@ public: static int b; -#if defined(_MSC_VER) +#if defined(_MSC_VER) && _MSC_VER < 1800 __asm fld a __asm fistp b /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) @@ -148,7 +148,7 @@ public: : "=m" (b) : "m" (a));*/ #else - b=lrintf(a); //assuming everything but msvc has lrint + b=lrintf(a); //assuming everything but msvc 2012 or earlier has lrint #endif return b; } |