Merge pull request #884 from firewave/extra-stmt

fixed Clang -Wextra-stmt warnings with TIXMLASSERT
This commit is contained in:
Lee Thomason
2022-04-02 13:44:42 -07:00
committed by GitHub

View File

@@ -83,16 +83,16 @@ distribution.
#if defined(TINYXML2_DEBUG) #if defined(TINYXML2_DEBUG)
# if defined(_MSC_VER) # if defined(_MSC_VER)
# // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like # // "(void)0," is for suppressing C4127 warning in "assert(false)", "assert(true)" and the like
# define TIXMLASSERT( x ) if ( !((void)0,(x))) { __debugbreak(); } # define TIXMLASSERT( x ) do { if ( !((void)0,(x))) { __debugbreak(); } } while(false)
# 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 ) do { if ( !(x)) { __android_log_assert( "assert", "grinliz", "ASSERT in '%s' at %d.", __FILE__, __LINE__ ); } } while(false)
# else # else
# include <assert.h> # include <assert.h>
# define TIXMLASSERT assert # define TIXMLASSERT assert
# endif # endif
#else #else
# define TIXMLASSERT( x ) {} # define TIXMLASSERT( x ) do {} while(false)
#endif #endif
#endif #endif