From 0bb71e723fe63ef95e6a68bd7faf186c6a7d0e32 Mon Sep 17 00:00:00 2001
From: Matthew Casey <mdcasey@chabloom.com>
Date: Tue, 11 Feb 2014 14:19:52 -0500
Subject: Make math_funcs.h use lrint on msvc 2013

---
 core/math/math_funcs.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'core/math')

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;
 	}
-- 
cgit v1.2.3