diff options
| author | Sean McBride <sean@rogue-research.com> | 2022-06-22 16:16:30 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-22 16:16:30 (GMT) |
| commit | 8b2e7b32b5b9987938ebf6936205f324bc5050b8 (patch) | |
| tree | 17062db1b0521cbe22e759c5083b216ae6c62437 /src/H5FDpublic.h | |
| parent | 55f4cc0caa69d65c505e926fb7b2568ab1a76c58 (diff) | |
| download | hdf5-8b2e7b32b5b9987938ebf6936205f324bc5050b8.zip hdf5-8b2e7b32b5b9987938ebf6936205f324bc5050b8.tar.gz hdf5-8b2e7b32b5b9987938ebf6936205f324bc5050b8.tar.bz2 | |
Various warning fixes (#1812)
* Fixed -Wreserved-id-macro warnings from header include guards
* Removed all __int64 and LL suffix stuff now that C99 is minimum requirement
* Rename `H5FD_CTL__` to `H5FD_CTL_` to fix -Wreserved-id-macro warnings
Double underscore is reserved in C++ and this public header should be C++ compatible.
* Never define __STDC_FORMAT_MACROS anymore
Defining it causes a -Wreserved-id-macro.
Happily, according to the C++11 standard:
"The macros defined by <stdint> are provided unconditionally. In particular, the symbols __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS (mentioned in C99 footnotes 219, 220, and 222) play no role in C++."
https://cplusplus.github.io/LWG/issue984
So looks like it's not necessary to define it with reasonably new toolchains.
* Fixed some -Wunused-macros warnings, removed dead code
* Fixed all -Wdouble-promotion warnings in C++ files
* Fixed remaining -Wsuggest-destructor-override warnings
* Committing clang-format changes
Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Diffstat (limited to 'src/H5FDpublic.h')
| -rw-r--r-- | src/H5FDpublic.h | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h index 221f569..5221e35 100644 --- a/src/H5FDpublic.h +++ b/src/H5FDpublic.h @@ -188,14 +188,14 @@ (H5FD_CTL_OPC_RESERVED + 511) /* Maximum opcode value available for experimental use */ /* ctl function op codes: */ -#define H5FD_CTL__INVALID_OPCODE 0 -#define H5FD_CTL__TEST_OPCODE 1 -#define H5FD_CTL__GET_MPI_COMMUNICATOR_OPCODE 2 -#define H5FD_CTL__GET_MPI_RANK_OPCODE 3 -#define H5FD_CTL__GET_MPI_SIZE_OPCODE 4 -#define H5FD_CTL__MEM_ALLOC 5 -#define H5FD_CTL__MEM_FREE 6 -#define H5FD_CTL__MEM_COPY 7 +#define H5FD_CTL_INVALID_OPCODE 0 +#define H5FD_CTL_TEST_OPCODE 1 +#define H5FD_CTL_GET_MPI_COMMUNICATOR_OPCODE 2 +#define H5FD_CTL_GET_MPI_RANK_OPCODE 3 +#define H5FD_CTL_GET_MPI_SIZE_OPCODE 4 +#define H5FD_CTL_MEM_ALLOC 5 +#define H5FD_CTL_MEM_FREE 6 +#define H5FD_CTL_MEM_COPY 7 /* ctl function flags: */ @@ -227,7 +227,7 @@ */ /* Unknown op codes should be ignored silently unless the - * H5FD_CTL__FAIL_IF_UNKNOWN_FLAG is set. + * H5FD_CTL_FAIL_IF_UNKNOWN_FLAG is set. * * On terminal VFDs, unknown op codes should generate an * error unconditionally if this flag is set. @@ -237,9 +237,9 @@ * flags. In the absence of such flags, the VFD should * generate an error. */ -#define H5FD_CTL__FAIL_IF_UNKNOWN_FLAG 0x0001 +#define H5FD_CTL_FAIL_IF_UNKNOWN_FLAG 0x0001 -/* The H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG is used only +/* The H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG is used only * by non-ternminal VFDs, and only applies to unknown * opcodes. (known op codes should be handled as * appropriate.) @@ -249,9 +249,9 @@ * the VFD stack en-route to the terminal VFD. * If that VFD does not support the ctl call, the * pass through VFD should fail or succeed as directed - * by the H5FD_CTL__FAIL_IF_UNKNOWN_FLAG. + * by the H5FD_CTL_FAIL_IF_UNKNOWN_FLAG. */ -#define H5FD_CTL__ROUTE_TO_TERMINAL_VFD_FLAG 0x0002 +#define H5FD_CTL_ROUTE_TO_TERMINAL_VFD_FLAG 0x0002 /*******************/ /* Public Typedefs */ |