From 696c0b890ee1caa327daedc9dd6e5d67a6cae33c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Thu, 11 Oct 2018 22:05:55 +0200 Subject: [PATCH] macro: drop -Wdeclaration-after-statement exclusion magic, we dropped that warning anyway from our build --- src/basic/macro.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/basic/macro.h b/src/basic/macro.h index 9972b6f9927..361ffbc5d02 100644 --- a/src/basic/macro.h +++ b/src/basic/macro.h @@ -56,10 +56,6 @@ #endif /* Temporarily disable some warnings */ -#define DISABLE_WARNING_DECLARATION_AFTER_STATEMENT \ - _Pragma("GCC diagnostic push"); \ - _Pragma("GCC diagnostic ignored \"-Wdeclaration-after-statement\"") - #define DISABLE_WARNING_FORMAT_NONLITERAL \ _Pragma("GCC diagnostic push"); \ _Pragma("GCC diagnostic ignored \"-Wformat-nonliteral\"") @@ -314,20 +310,13 @@ static inline int __coverity_check__(int condition) { } while (false) #if defined(static_assert) -/* static_assert() is sometimes defined in a way that trips up - * -Wdeclaration-after-statement, hence let's temporarily turn off - * this warning around it. */ #define assert_cc(expr) \ - DISABLE_WARNING_DECLARATION_AFTER_STATEMENT; \ - static_assert(expr, #expr); \ - REENABLE_WARNING + static_assert(expr, #expr); #else #define assert_cc(expr) \ - DISABLE_WARNING_DECLARATION_AFTER_STATEMENT; \ struct CONCATENATE(_assert_struct_, __COUNTER__) { \ char x[(expr) ? 0 : -1]; \ - }; \ - REENABLE_WARNING + }; #endif #define assert_return(expr, r) \ -- 2.47.3