Merge pull request #884 from firewave/extra-stmt

fixed Clang -Wextra-stmt warnings with TIXMLASSERT

1 files changed, 3 insertions, 3 deletions

diff --git a/tinyxml2.h b/tinyxml2.h
index 452ae95..cfb1053 100755
--- a/tinyxml2.h
+++ b/tinyxml2.h
@@ -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