Merge pull request #7 from gamaral/master

Found a new bug on MSVC 64.
This commit is contained in:
Lee Thomason 2012-03-24 12:38:21 -07:00
commit a3bdeeb110
1 changed files with 1 additions and 1 deletions

View File

@ -56,7 +56,7 @@ distribution.
#if defined(DEBUG) #if defined(DEBUG)
#if defined(_MSC_VER) #if defined(_MSC_VER)
#define TIXMLASSERT( x ) if ( !(x)) { _asm { int 3 } } //if ( !(x)) WinDebugBreak() #define TIXMLASSERT( x ) if ( !(x)) { __debugbreak(); } //if ( !(x)) WinDebugBreak()
#elif defined (ANDROID_NDK) #elif defined (ANDROID_NDK)
#include <android/log.h> #include <android/log.h>
#define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } #define TIXMLASSERT( x ) if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); }