Merge pull request #631 from artoowang/master

Fixed btAssert warning message on printf in MSVC.
2016-05-17 21:03:37 -07:00
parent fd5bca1bab cfcb8eda9b
commit 43fa1622aa
1 changed files with 1 additions and 1 deletions
--- a/src/LinearMath/btScalar.h
+++ b/src/LinearMath/btScalar.h
@@ -104,7 +104,7 @@ inline int	btGetVersion()
 #ifdef BT_DEBUG
 	#ifdef _MSC_VER
 		#include <stdio.h>
-		#define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u ("#x")\n", __LINE__);__debugbreak();	}}
+		#define btAssert(x) { if(!(x)){printf("Assert "__FILE__ ":%u (%s)\n", __LINE__, #x);__debugbreak();	}}
 	#else//_MSC_VER
 		#include <assert.h>
 		#define btAssert assert