diff options
| author | David Young <dyoung@hdfgroup.org> | 2020-01-29 19:51:52 (GMT) |
|---|---|---|
| committer | David Young <dyoung@hdfgroup.org> | 2020-01-29 19:51:52 (GMT) |
| commit | 43d41633a1ebfb77e5b7f688f31a2be20271300f (patch) | |
| tree | b4989bdaf2814eae918d379a36c2ef7fbd0e0b17 /test/h5test.c | |
| parent | 0d6e02588879a6ff2afcfabcf7090e39e59accf7 (diff) | |
| parent | fa1b2f6ef35c459c9f74ead885c119ae7f61c056 (diff) | |
| download | hdf5-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 'test/h5test.c')
| -rw-r--r-- | test/h5test.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/test/h5test.c b/test/h5test.c index ab859a5..bfc24dd 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -196,8 +196,7 @@ h5_clean_files(const char *base_name[], hid_t fapl) * sub_filename 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) void h5_delete_test_file(const char *base_name, hid_t fapl) { @@ -247,7 +246,7 @@ h5_delete_test_file(const char *base_name, hid_t fapl) return; } /* end h5_delete_test_file() */ -#pragma GCC diagnostic pop +H5_GCC_DIAG_ON(format-nonliteral) /*------------------------------------------------------------------------- @@ -1358,8 +1357,7 @@ h5_dump_info_object(MPI_Info info) * 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) h5_stat_size_t h5_get_file_size(const char *filename, hid_t fapl) { @@ -1461,7 +1459,7 @@ h5_get_file_size(const char *filename, hid_t fapl) return(-1); } /* end get_file_size() */ -#pragma GCC diagnostic pop +H5_GCC_DIAG_ON(format-nonliteral) /* * This routine is designed to provide equivalent functionality to 'printf' |