diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2018-12-07 00:03:00 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2018-12-07 00:03:00 (GMT) |
| commit | 7796cbd4174e85aa211dbffa562ada7413f1dbf7 (patch) | |
| tree | 105ae956c4ec4c20d28de7c76e6ea728793c1f8e | |
| parent | 026507404b1f554eb3b0f2b85d210faf985569d6 (diff) | |
| parent | a60702605496bb5dfb12af0c0385590df85b31a3 (diff) | |
| download | hdf5-7796cbd4174e85aa211dbffa562ada7413f1dbf7.zip hdf5-7796cbd4174e85aa211dbffa562ada7413f1dbf7.tar.gz hdf5-7796cbd4174e85aa211dbffa562ada7413f1dbf7.tar.bz2 | |
Merge pull request #1360 in HDFFV/hdf5 from stackable_vol_fix_04 to develop
* commit 'a60702605496bb5dfb12af0c0385590df85b31a3':
Fix build errors VOL changes, when using --disable-deprecated-symbols.
| -rw-r--r-- | src/H5Apkg.h | 12 | ||||
| -rw-r--r-- | src/H5Gpkg.h | 12 |
2 files changed, 20 insertions, 4 deletions
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; |