diff options
| author | Larry Knox <lrknox@hdfgroup.org> | 2020-04-28 16:27:19 (GMT) |
|---|---|---|
| committer | Larry Knox <lrknox@hdfgroup.org> | 2020-04-28 16:27:19 (GMT) |
| commit | 86096a5621a51e5df0d15c92c1ed59eb9df4610f (patch) | |
| tree | 3924daf0130fa09278d08d0d1d9ace7e78793b16 | |
| parent | ca3ad15ac3d7b5ae5df91c527dbc3e1cbd872dd9 (diff) | |
| parent | 25ffe5a0e79c8c9d26b557e8d09599b736c86ebc (diff) | |
| download | hdf5-86096a5621a51e5df0d15c92c1ed59eb9df4610f.zip hdf5-86096a5621a51e5df0d15c92c1ed59eb9df4610f.tar.gz hdf5-86096a5621a51e5df0d15c92c1ed59eb9df4610f.tar.bz2 | |
Merge pull request #2550 in HDFFV/hdf5 from ~LRKNOX/hdf5_lrk:hdf5_1_10 to hdf5_1_10
* commit '25ffe5a0e79c8c9d26b557e8d09599b736c86ebc':
Add -Werror= flags to lists displayed in libhdf5.settings.
Fix errors: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement]
| -rw-r--r-- | src/libhdf5.settings.in | 4 | ||||
| -rw-r--r-- | testpar/t_mdset.c | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/libhdf5.settings.in b/src/libhdf5.settings.in index baa99ea..422ca0b 100644 --- a/src/libhdf5.settings.in +++ b/src/libhdf5.settings.in @@ -39,7 +39,7 @@ Languages: H5_CPPFLAGS: @H5_CPPFLAGS@ AM_CPPFLAGS: @AM_CPPFLAGS@ C Flags: @CFLAGS@ - H5 C Flags: @H5_CFLAGS@ + H5 C Flags: @H5_CFLAGS@ @H5_ECFLAGS@ AM C Flags: @AM_CFLAGS@ Shared C Library: @enable_shared@ Static C Library: @enable_static@ @@ -56,7 +56,7 @@ Languages: C++: @HDF_CXX@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Compiler: @CXX_VERSION@ @BUILD_CXX_CONDITIONAL_TRUE@ C++ Flags: @CXXFLAGS@ -@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ +@BUILD_CXX_CONDITIONAL_TRUE@ H5 C++ Flags: @H5_CXXFLAGS@ @H5_ECXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ AM C++ Flags: @AM_CXXFLAGS@ @BUILD_CXX_CONDITIONAL_TRUE@ Shared C++ Library: @enable_shared@ @BUILD_CXX_CONDITIONAL_TRUE@ Static C++ Library: @enable_static@ diff --git a/testpar/t_mdset.c b/testpar/t_mdset.c index 63ac8d3..ed8867d 100644 --- a/testpar/t_mdset.c +++ b/testpar/t_mdset.c @@ -233,6 +233,9 @@ void compact_dataset(void) char dname[]="dataset"; herr_t ret; const char *filename; +#ifdef H5_HAVE_INSTRUMENTED_LIBRARY + hbool_t prop_value; +#endif size = get_size(); @@ -312,7 +315,6 @@ void compact_dataset(void) VRFY((dataset >= 0), "H5Dopen2 succeeded"); #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - hbool_t prop_value; prop_value = H5D_XFER_COLL_RANK0_BCAST_DEF; ret = H5Pinsert2(dxpl, H5D_XFER_COLL_RANK0_BCAST_NAME, H5D_XFER_COLL_RANK0_BCAST_SIZE, &prop_value, NULL, NULL, NULL, NULL, NULL, NULL); @@ -618,6 +620,9 @@ void dataset_fillvalue(void) int acc, i, ii, j, k, l; /* Local index variables */ herr_t ret; /* Generic return value */ const char *filename; +#ifdef H5_HAVE_INSTRUMENTED_LIBRARY + hbool_t prop_value; +#endif MPI_Comm_rank(MPI_COMM_WORLD, &mpi_rank); MPI_Comm_size(MPI_COMM_WORLD, &mpi_size); @@ -662,7 +667,6 @@ void dataset_fillvalue(void) VRFY((dxpl >= 0), "H5Pcreate succeeded"); #ifdef H5_HAVE_INSTRUMENTED_LIBRARY - hbool_t prop_value; prop_value = H5D_XFER_COLL_RANK0_BCAST_DEF; ret = H5Pinsert2(dxpl, H5D_XFER_COLL_RANK0_BCAST_NAME, H5D_XFER_COLL_RANK0_BCAST_SIZE, &prop_value, NULL, NULL, NULL, NULL, NULL, NULL); |