godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #41 from mdcasey/master 

Make math_funcs.h use lrint on msvc 2013
This commit is contained in:
reduz 2014-02-13 00:13:08 -02:00
parent 8abbc20c7f 0bb71e723f
commit 3319fd3afa
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/math/math_funcs.h
View File

@ -136,7 +136,7 @@ public:
static int b; static int b;
#if defined(_MSC_VER) #if defined(_MSC_VER) && _MSC_VER < 1800
__asm fld a __asm fld a
__asm fistp b __asm fistp b
/*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) ) /*#elif defined( __GNUC__ ) && ( defined( __i386__ ) || defined( __x86_64__ ) )
@ -148,7 +148,7 @@ public:
: "=m" (b) : "=m" (b)
: "m" (a));*/ : "m" (a));*/
#else #else
b=lrintf(a); //assuming everything but msvc has lrint b=lrintf(a); //assuming everything but msvc 2012 or earlier has lrint
#endif #endif
return b; return b;
} }