diff options
author | Sean McBride <sean@rogue-research.com> | 2021-09-16 12:42:20 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-09-16 12:42:20 (GMT) |
commit | 1f2bba5255014465a319750e2ba712ebb70eee74 (patch) | |
tree | c87689592004808410b589cee3b4740259535486 /src/H5FDmulti.c | |
parent | 1c892fb41fb5439d3b4a69fd3cd9d25e4aa2ee6e (diff) | |
download | hdf5-1f2bba5255014465a319750e2ba712ebb70eee74.zip hdf5-1f2bba5255014465a319750e2ba712ebb70eee74.tar.gz hdf5-1f2bba5255014465a319750e2ba712ebb70eee74.tar.bz2 |
Modified gcc/clang warning suppression macros to account for some warnings flags being supported by one compiler but not the other (#379)
* Committing clang-format changes
* Fixed GCC warning suppression pragmas to also work with clang
H5_GCC_DIAG_ON remains gcc-only.
Added a new H5_CLANG_DIAG_ON that's clang-only, but it's not used anywhere currently.
Added a new H5_GCC_CLANG_DIAG_ON that works with both compilers, which afterall support mostly the same warnings. Changed almost all uses of H5_GCC_DIAG_ON to use H5_GCC_CLANG_DIAG_ON, with the exception of a couple, where they really were suppressing gcc-only warnings.
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5FDmulti.c')
-rw-r--r-- | src/H5FDmulti.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/H5FDmulti.c b/src/H5FDmulti.c index e059e55..cae4174 100644 --- a/src/H5FDmulti.c +++ b/src/H5FDmulti.c @@ -44,7 +44,7 @@ #define my_strdup strdup #endif -/* Macros for enabling/disabling particular GCC warnings +/* Macros for enabling/disabling particular GCC / clang warnings * * These are (renamed) duplicates of macros in H5private.h. If you make changes * here, be sure to update those as well. @@ -2019,6 +2019,7 @@ open_members(H5FD_multi_t *file) return 0; } +H5_MULTI_GCC_DIAG_ON("format-nonliteral") /*------------------------------------------------------------------------- * Function: H5FD_multi_delete @@ -2029,6 +2030,7 @@ open_members(H5FD_multi_t *file) * *------------------------------------------------------------------------- */ +H5_MULTI_GCC_DIAG_OFF("format-nonliteral") static herr_t H5FD_multi_delete(const char *filename, hid_t fapl_id) { |