From 57298c71c8dbaa715f1a619f5187d239b317c056 Mon Sep 17 00:00:00 2001
From: castano <castano@95f4ed2b-212e-0410-8b90-d31948207fce>
Date: Wed, 21 May 2014 17:23:05 +0000
Subject: [PATCH] Fix issue 194.

---
 src/nvmath/nvmath.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nvmath/nvmath.h b/src/nvmath/nvmath.h
index 4c455e8..f2a907c 100644
--- a/src/nvmath/nvmath.h
+++ b/src/nvmath/nvmath.h
@@ -91,12 +91,14 @@ inline float asinf_assert(const float f)
 }
 
 // Replace default functions with asserting ones.
+#if !NV_CC_MSVC || (NV_CC_MSVC && (_MSC_VER < 1700))    // IC: Apparently this was causing problems in Visual Studio 2012. See Issue 194: https://code.google.com/p/nvidia-texture-tools/issues/detail?id=194
 #define sqrt sqrt_assert
 #define sqrtf sqrtf_assert
 #define acos acos_assert
 #define acosf acosf_assert
 #define asin asin_assert
 #define asinf asinf_assert
+#endif
 
 #if NV_CC_MSVC
 NV_FORCEINLINE float log2f(float x)