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/h5test.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/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 d8c0205..78d0077 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -203,8 +203,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) { @@ -254,7 +253,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) /*------------------------------------------------------------------------- @@ -1365,8 +1364,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) { @@ -1468,7 +1466,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' |