summaryrefslogtreecommitdiffstats
path: root/src/H5FDmpio.c
diff options
context:
space:
mode:
authorSean McBride <sean@rogue-research.com>2022-06-22 16:16:30 (GMT)
committerGitHub <noreply@github.com>2022-06-22 16:16:30 (GMT)
commit8b2e7b32b5b9987938ebf6936205f324bc5050b8 (patch)
tree17062db1b0521cbe22e759c5083b216ae6c62437 /src/H5FDmpio.c
parent55f4cc0caa69d65c505e926fb7b2568ab1a76c58 (diff)
downloadhdf5-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/H5FDmpio.c')
-rw-r--r--src/H5FDmpio.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index 1be4779..ce32bc7 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -3017,9 +3017,9 @@ done:
*
* At present, the supported op codes are:
*
- * H5FD_CTL__GET_MPI_COMMUNICATOR_OPCODE
- * H5FD_CTL__GET_MPI_RANK_OPCODE
- * H5FD_CTL__GET_MPI_SIZE_OPCODE
+ * H5FD_CTL_GET_MPI_COMMUNICATOR_OPCODE
+ * H5FD_CTL_GET_MPI_RANK_OPCODE
+ * H5FD_CTL_GET_MPI_SIZE_OPCODE
*
* Note that these opcodes must be supported by all VFDs that
* support MPI.
@@ -3045,26 +3045,26 @@ H5FD__mpio_ctl(H5FD_t *_file, uint64_t op_code, uint64_t flags, const void H5_AT
switch (op_code) {
- case H5FD_CTL__GET_MPI_COMMUNICATOR_OPCODE:
+ case H5FD_CTL_GET_MPI_COMMUNICATOR_OPCODE:
HDassert(output);
HDassert(*output);
**((MPI_Comm **)output) = file->comm;
break;
- case H5FD_CTL__GET_MPI_RANK_OPCODE:
+ case H5FD_CTL_GET_MPI_RANK_OPCODE:
HDassert(output);
HDassert(*output);
**((int **)output) = file->mpi_rank;
break;
- case H5FD_CTL__GET_MPI_SIZE_OPCODE:
+ case H5FD_CTL_GET_MPI_SIZE_OPCODE:
HDassert(output);
HDassert(*output);
**((int **)output) = file->mpi_size;
break;
default: /* unknown op code */
- if (flags & H5FD_CTL__FAIL_IF_UNKNOWN_FLAG) {
+ if (flags & H5FD_CTL_FAIL_IF_UNKNOWN_FLAG) {
HGOTO_ERROR(H5E_VFL, H5E_FCNTL, FAIL, "unknown op_code and fail if unknown")
}