diff options
author | kmu <kmu@hdfgroup.org> | 2020-01-29 20:03:48 (GMT) |
---|---|---|
committer | kmu <kmu@hdfgroup.org> | 2020-01-29 20:03:48 (GMT) |
commit | c586d91ea003f37d130c2c45eea6f573f7d3d3bc (patch) | |
tree | 8ea8c02a7b13f323601128e9b58f6347b35e82c9 /test/fheap.c | |
parent | 4453dc2998f9e053896a0d2da6484c3884ce0c6a (diff) | |
parent | 43d41633a1ebfb77e5b7f688f31a2be20271300f (diff) | |
download | hdf5-c586d91ea003f37d130c2c45eea6f573f7d3d3bc.zip hdf5-c586d91ea003f37d130c2c45eea6f573f7d3d3bc.tar.gz hdf5-c586d91ea003f37d130c2c45eea6f573f7d3d3bc.tar.bz2 |
Merge branch 'develop' into misc
Diffstat (limited to 'test/fheap.c')
-rw-r--r-- | test/fheap.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/fheap.c b/test/fheap.c index b8c54d6..7772ff7 100644 --- a/test/fheap.c +++ b/test/fheap.c @@ -545,8 +545,7 @@ get_fill_size(const fheap_test_param_t *tparam) * test_desc in the code below, but early (4.4.7, at least) gcc only * allows diagnostic pragmas to be toggled outside of functions. */ -#pragma GCC diagnostic push -#pragma GCC diagnostic ignored "-Wformat-nonliteral" +H5_GCC_DIAG_OFF(format-nonliteral) static int begin_test(fheap_test_param_t *tparam, const char *base_desc, fheap_heap_ids_t *keep_ids, size_t *fill_size) @@ -575,7 +574,7 @@ begin_test(fheap_test_param_t *tparam, const char *base_desc, /* Success */ return(0); } /* end begin_test() */ -#pragma GCC diagnostic pop +H5_GCC_DIAG_ON(format-nonliteral) /*------------------------------------------------------------------------- |