diff options
| author | reduz <reduzio@gmail.com> | 2014-02-13 00:13:08 -0200 |
|---|---|---|
| committer | reduz <reduzio@gmail.com> | 2014-02-13 00:13:08 -0200 |
| commit | 3319fd3afa40c2c4098ace04bf3d85d9343a90bc (patch) | |
| tree | 644c04892ed95f709a429334bfc9ab1db149c1c2 | |
| parent | 8abbc20c7fdb8064064731f26dbf4209497c3571 (diff) | |
| parent | 0bb71e723fe63ef95e6a68bd7faf186c6a7d0e32 (diff) | |
Merge pull request #41 from mdcasey/master
Make math_funcs.h use lrint on msvc 2013
| -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; } |