From 2e28927506ce3e1d00d5adc14a8e73bfa0f8297f Mon Sep 17 00:00:00 2001 From: Dominik Thoennes <dominik.thoennes@fau.de> Date: Thu, 4 Apr 2019 13:41:12 +0200 Subject: [PATCH] add semicolons for ASSERT macros This is needed to avoid different behaviour between release and debug builds --- src/core/debug/Debug.h | 82 +++++++++++++++++++++--------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/src/core/debug/Debug.h b/src/core/debug/Debug.h index ef717cfc0..f5cf03686 100644 --- a/src/core/debug/Debug.h +++ b/src/core/debug/Debug.h @@ -193,47 +193,47 @@ #else // NDBEUG -#define WALBERLA_ASSERT_1(X) (void(0)) -#define WALBERLA_ASSERT_NULLPTR_1(X) (void(0)) -#define WALBERLA_ASSERT_NOT_NULLPTR_1(X) (void(0)) -#define WALBERLA_ASSERT_EQUAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_UNEQUAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_FLOAT_EQUAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_FLOAT_UNEQUAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_IDENTICAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_NOT_IDENTICAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_LESS_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_GREATER_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_LESS_EQUAL_2(X,Y) (void(0)) -#define WALBERLA_ASSERT_GREATER_EQUAL_2(X,Y) (void(0)) - -#define WALBERLA_ASSERT_2(X,MSG) (void(0)) -#define WALBERLA_ASSERT_NULLPTR_2(X,MSG) (void(0)) -#define WALBERLA_ASSERT_NOT_NULLPTR_2(X,MSG) (void(0)) -#define WALBERLA_ASSERT_EQUAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_UNEQUAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_FLOAT_EQUAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_FLOAT_UNEQUAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_IDENTICAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_NOT_IDENTICAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_LESS_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_GREATER_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_LESS_EQUAL_3(X,Y,MSG) (void(0)) -#define WALBERLA_ASSERT_GREATER_EQUAL_3(X,Y,MSG) (void(0)) - -#define WALBERLA_ASSERT(...) (void(0)) -#define WALBERLA_ASSERT_NULLPTR(...) (void(0)) -#define WALBERLA_ASSERT_NOT_NULLPTR(...) (void(0)) -#define WALBERLA_ASSERT_EQUAL(...) (void(0)) -#define WALBERLA_ASSERT_UNEQUAL(...) (void(0)) -#define WALBERLA_ASSERT_FLOAT_EQUAL(...) (void(0)) -#define WALBERLA_ASSERT_FLOAT_UNEQUAL(...) (void(0)) -#define WALBERLA_ASSERT_IDENTICAL(...) (void(0)) -#define WALBERLA_ASSERT_NOT_IDENTICAL(...) (void(0)) -#define WALBERLA_ASSERT_LESS(...) (void(0)) -#define WALBERLA_ASSERT_GREATER(...) (void(0)) -#define WALBERLA_ASSERT_LESS_EQUAL(...) (void(0)) -#define WALBERLA_ASSERT_GREATER_EQUAL(...) (void(0)) +#define WALBERLA_ASSERT_1(X) (void(0)); +#define WALBERLA_ASSERT_NULLPTR_1(X) (void(0)); +#define WALBERLA_ASSERT_NOT_NULLPTR_1(X) (void(0)); +#define WALBERLA_ASSERT_EQUAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_UNEQUAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_FLOAT_EQUAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_FLOAT_UNEQUAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_IDENTICAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_NOT_IDENTICAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_LESS_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_GREATER_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_LESS_EQUAL_2(X,Y) (void(0)); +#define WALBERLA_ASSERT_GREATER_EQUAL_2(X,Y) (void(0)); + +#define WALBERLA_ASSERT_2(X,MSG) (void(0)); +#define WALBERLA_ASSERT_NULLPTR_2(X,MSG) (void(0)); +#define WALBERLA_ASSERT_NOT_NULLPTR_2(X,MSG) (void(0)); +#define WALBERLA_ASSERT_EQUAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_UNEQUAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_FLOAT_EQUAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_FLOAT_UNEQUAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_IDENTICAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_NOT_IDENTICAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_LESS_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_GREATER_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_LESS_EQUAL_3(X,Y,MSG) (void(0)); +#define WALBERLA_ASSERT_GREATER_EQUAL_3(X,Y,MSG) (void(0)); + +#define WALBERLA_ASSERT(...) (void(0)); +#define WALBERLA_ASSERT_NULLPTR(...) (void(0)); +#define WALBERLA_ASSERT_NOT_NULLPTR(...) (void(0)); +#define WALBERLA_ASSERT_EQUAL(...) (void(0)); +#define WALBERLA_ASSERT_UNEQUAL(...) (void(0)); +#define WALBERLA_ASSERT_FLOAT_EQUAL(...) (void(0)); +#define WALBERLA_ASSERT_FLOAT_UNEQUAL(...) (void(0)); +#define WALBERLA_ASSERT_IDENTICAL(...) (void(0)); +#define WALBERLA_ASSERT_NOT_IDENTICAL(...) (void(0)); +#define WALBERLA_ASSERT_LESS(...) (void(0)); +#define WALBERLA_ASSERT_GREATER(...) (void(0)); +#define WALBERLA_ASSERT_LESS_EQUAL(...) (void(0)); +#define WALBERLA_ASSERT_GREATER_EQUAL(...) (void(0)); #endif // NDBEUG -- GitLab