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 /src/H5PLint.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 'src/H5PLint.c')
-rw-r--r-- | src/H5PLint.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5PLint.c b/src/H5PLint.c index 8dec14b..b69a788 100644 --- a/src/H5PLint.c +++ b/src/H5PLint.c @@ -304,8 +304,7 @@ done: * get_plugin_info function pointer, 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 "-Wpedantic" +H5_GCC_DIAG_OFF(pedantic) herr_t H5PL__open(const char *path, H5PL_type_t type, const H5PL_key_t *key, hbool_t *success, const void **plugin_info) @@ -417,7 +416,7 @@ done: FUNC_LEAVE_NOAPI(ret_value) } /* end H5PL__open() */ -#pragma GCC diagnostic pop +H5_GCC_DIAG_ON(pedantic) /*------------------------------------------------------------------------- |