diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-12-07 17:26:03 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-12-07 17:26:03 (GMT) |
| commit | 698d0490b175ad0f95e7b8159235801cf3586011 (patch) | |
| tree | c72071937621b5a37926fafbe3b6789ec061e357 | |
| parent | 11b4c1f3afde1016de8c75e423054854bed62001 (diff) | |
| parent | 7796cbd4174e85aa211dbffa562ada7413f1dbf7 (diff) | |
| download | hdf5-698d0490b175ad0f95e7b8159235801cf3586011.zip hdf5-698d0490b175ad0f95e7b8159235801cf3586011.tar.gz hdf5-698d0490b175ad0f95e7b8159235801cf3586011.tar.bz2 | |
Merging in latest from upstream (HDFFV/hdf5:refs/heads/develop)
* commit '7796cbd4174e85aa211dbffa562ada7413f1dbf7':
Fix build errors VOL changes, when using --disable-deprecated-symbols.
Removed RELEASE.txt entry concerning --enable-debug/production configure flags as those changes were pushed to HDF5 1.10.
Remove reference to h5_vol_external_log_native.
| -rw-r--r-- | examples/run-c-ex.sh.in | 4 | ||||
| -rw-r--r-- | release_docs/RELEASE.txt | 13 | ||||
| -rw-r--r-- | src/H5Apkg.h | 12 | ||||
| -rw-r--r-- | src/H5Gpkg.h | 12 |
4 files changed, 21 insertions, 20 deletions
diff --git a/examples/run-c-ex.sh.in b/examples/run-c-ex.sh.in index 6ff2e9a..209cdd7 100644 --- a/examples/run-c-ex.sh.in +++ b/examples/run-c-ex.sh.in @@ -139,9 +139,7 @@ then RunTest h5_vds-percival-unlim-maxmin&&\ rm h5_vds-percival-unlim-maxmin &&\ RunTest h5_vds &&\ - rm h5_vds &&\ - RunTest h5_vol_external_log_native &&\ - rm h5_vol_external_log_native); then + rm h5_vds); then EXIT_VALUE=${EXIT_SUCCESS} else EXIT_VALUE=${EXIT_FAILURE} diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 3cc8e55..dd4ff44 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -521,19 +521,6 @@ Bug Fixes since HDF5-1.10.2 release (LRK - 2018/07/18, HDFFV-10475) - - The --enable-debug/production configure flags are listed as 'deprecated' - when they should really be listed as 'removed'. - - In the autotools overhaul several years ago, we removed these flags and - implemented a new --enable-build-mode= flag. This was done because we - changed the semantics of the modes and didn't want users to silently - be exposed to them. The newer system is also more flexible and us to - add other modes (like 'clean'). - - The --enable-debug/production flags are now listed as removed. - - (DER - 2018/05/31, HDFFV-10505) - - Moved the location of gcc attribute. The gcc attribute(no_sanitize), named as the macro HDF_NO_UBSAN, diff --git a/src/H5Apkg.h b/src/H5Apkg.h index 12e0857..cfe9dae 100644 --- a/src/H5Apkg.h +++ b/src/H5Apkg.h @@ -157,9 +157,17 @@ typedef struct { /* Types for optional attribute VOL operations */ typedef enum H5VL_attr_optional_t { -#ifndef H5_NO_DEPRECATED_SYMBOLS H5VL_ATTR_ITERATE_OLD /* H5Aiterate (deprecated routine) */ -#endif /* H5_NO_DEPRECATED_SYMBOLS */ + /* (This enum value should have an + * "#ifndefH5_NO_DEPRECATED_SYMBOLS" + * around it, but the compiler + * complains about an empty enum + * when deprecated symbols are + * disabled currently. When + * another enum value is added, + * please put the #ifdef around + * this symbol. QAK - 2018/12/06 + */ } H5VL_attr_optional_t; diff --git a/src/H5Gpkg.h b/src/H5Gpkg.h index ef330c4..159b6f5 100644 --- a/src/H5Gpkg.h +++ b/src/H5Gpkg.h @@ -301,10 +301,18 @@ typedef struct H5G_copy_file_ud_t { /* Types for optional group VOL operations */ typedef enum H5VL_group_optional_t { -#ifndef H5_NO_DEPRECATED_SYMBOLS H5VL_GROUP_ITERATE_OLD, /* HG5Giterate (deprecated routine) */ H5VL_GROUP_GET_OBJINFO /* HG5Gget_objinfo (deprecated routine) */ -#endif /* H5_NO_DEPRECATED_SYMBOLS */ + /* (These two enum values should have an + * "#ifndefH5_NO_DEPRECATED_SYMBOLS" + * around them, but the compiler + * complains about an empty enum + * when deprecated symbols are + * disabled currently. When + * another enum value is added, + * please put the #ifdef around + * these symbols. QAK - 2018/12/06 + */ } H5VL_group_optional_t; |