summaryrefslogtreecommitdiffstats
path: root/tools/test
diff options
context:
space:
mode:
authorDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:52 (GMT)
committerDavid Young <dyoung@hdfgroup.org>2020-01-29 19:51:52 (GMT)
commit43d41633a1ebfb77e5b7f688f31a2be20271300f (patch)
treeb4989bdaf2814eae918d379a36c2ef7fbd0e0b17 /tools/test
parent0d6e02588879a6ff2afcfabcf7090e39e59accf7 (diff)
parentfa1b2f6ef35c459c9f74ead885c119ae7f61c056 (diff)
downloadhdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.zip
hdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.tar.gz
hdf5-43d41633a1ebfb77e5b7f688f31a2be20271300f.tar.bz2
Merge pull request #2318 in HDFFV/hdf5 from ~DYOUNG/werror:reduce-werror-diffs-1 to develop
* commit 'fa1b2f6ef35c459c9f74ead885c119ae7f61c056': Reduce differences between my -Werror branch and `develop`:
Diffstat (limited to 'tools/test')
-rw-r--r--tools/test/perform/sio_engine.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/test/perform/sio_engine.c b/tools/test/perform/sio_engine.c
index 69409bb..9ea94cb 100644
--- a/tools/test/perform/sio_engine.c
+++ b/tools/test/perform/sio_engine.c
@@ -1268,8 +1268,7 @@ done:
* 'temp' 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 void
do_cleanupfile(iotype iot, char *filename)
{
@@ -1331,5 +1330,5 @@ do_cleanupfile(iotype iot, char *filename)
}
}
}
-#pragma GCC diagnostic pop
+H5_GCC_DIAG_ON(format-nonliteral)