summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Mitchell <davem@iabyn.com>2015-06-20 02:56:03 +0100
committerDavid Mitchell <davem@iabyn.com>2015-06-20 02:56:03 +0100
commitd0044f85765711dedf1c7f77454b589f75f53dbb (patch)
tree5dc7e5c45671c60b13b0b046e552e03bd4ec83e1
parentf0b1ad2b19f6dbfdc5d5feb5c5fb48888f1cd46d (diff)
downloadperl-d0044f85765711dedf1c7f77454b589f75f53dbb.tar.gz
partially revert 'silence gcc -pendantic warnings'
The GCC_DIAG_IGNORE(-Wpedantic) stuff added by me to STATIC_ASSERT_GLOBAL() by ac892e4a230de5b was causing some smoke failures. I don't yet understand why.
-rw-r--r--perl.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/perl.h b/perl.h
index bc54d0b20e..ad94402d18 100644
--- a/perl.h
+++ b/perl.h
@@ -3526,10 +3526,7 @@ typedef pthread_key_t perl_key;
builtin in C++11.
*/
/* IBM XL C V11 does not support _Static_assert, no matter what <assert.h> says */
-# define STATIC_ASSERT_GLOBAL(COND) \
- GCC_DIAG_IGNORE(-Wpedantic); \
- static_assert(COND, #COND); \
- GCC_DIAG_RESTORE;
+# define STATIC_ASSERT_GLOBAL(COND) static_assert(COND, #COND)
#else
/* We use a bit-field instead of an array because gcc accepts
'typedef char x[n]' where n is not a compile-time constant.