diff options
author | Lee Thomason <leethomason@gmail.com> | 2022-04-02 23:44:42 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-02 23:44:42 +0300 |
commit | 34dd03ecc24602632589024e9ddd2865e38b84e3 (patch) | |
tree | c9f59a938e4eb0798e3d688e86265664f41b42c1 | |
parent | cf0a876aadad768a3df03675dcdf31e5dd7aa18e (diff) | |
parent | c27699a9d6d5c6e89696e45fa9c51efa7fc7d116 (diff) |
Merge pull request #884 from firewave/extra-stmt
fixed Clang -Wextra-stmt warnings with TIXMLASSERT
-rwxr-xr-x | tinyxml2.h | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -83,16 +83,16 @@ distribution. #if defined(TINYXML2_DEBUG)
# if defined(_MSC_VER)
# // "(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)
# 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
# include <assert.h>
# define TIXMLASSERT assert
# endif
#else
-# define TIXMLASSERT( x ) {}
+# define TIXMLASSERT( x ) do {} while(false)
#endif
#endif
|