diff options
| author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-04 14:38:16 (GMT) |
|---|---|---|
| committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-02-04 14:38:16 (GMT) |
| commit | 06d1971f415a9eeb1ab995a3276f7f13508dde02 (patch) | |
| tree | bd7cbae59420dabd0fe1b48f690e2af0e4bcdf7d | |
| parent | 5060fb1050c6b65bc67d04f7f7756deb7e1600d1 (diff) | |
| download | hdf5-06d1971f415a9eeb1ab995a3276f7f13508dde02.zip hdf5-06d1971f415a9eeb1ab995a3276f7f13508dde02.tar.gz hdf5-06d1971f415a9eeb1ab995a3276f7f13508dde02.tar.bz2 | |
[svn-r26124] Fixed issue with deprecated symbols for H5G constants
| -rw-r--r-- | fortran/src/H5_f.c | 28 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 22 |
2 files changed, 23 insertions, 27 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index 4e6edc3..a149109 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -471,21 +471,19 @@ nh5init_flags_c( int_f *h5d_flags, size_t_f *h5d_size_flags, /* * H5G flags */ - h5g_flags[0] = (int_f)H5G_UNKNOWN; - h5g_flags[1] = (int_f)H5G_GROUP; - h5g_flags[2] = (int_f)H5G_DATASET; - h5g_flags[3] = (int_f)H5G_TYPE; - h5g_flags[4] = (int_f)H5G_LINK; - h5g_flags[5] = (int_f)H5G_UDLINK; - h5g_flags[6] = (int_f)H5L_SAME_LOC; - h5g_flags[7] = (int_f)H5L_TYPE_ERROR; - h5g_flags[8] = (int_f)H5L_TYPE_HARD; - h5g_flags[9] = (int_f)H5L_TYPE_SOFT; - - h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_UNKNOWN; - h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE; - h5g_flags[12] = (int_f)H5G_STORAGE_TYPE_COMPACT; - h5g_flags[13] = (int_f)H5G_STORAGE_TYPE_DENSE; + h5g_flags[0] = (int_f)H5O_TYPE_UNKNOWN; /* H5G_UNKNOWN is deprecated */ + h5g_flags[1] = (int_f)H5O_TYPE_GROUP; /* H5G_GROUP is deprecated */ + h5g_flags[2] = (int_f)H5O_TYPE_DATASET; /* H5G_DATASET is deprecated */ + h5g_flags[3] = (int_f)H5O_TYPE_NAMED_DATATYPE; /* H5G_TYPE is deprecated */ + h5g_flags[4] = (int_f)H5L_SAME_LOC; + h5g_flags[5] = (int_f)H5L_TYPE_ERROR; + h5g_flags[6] = (int_f)H5L_TYPE_HARD; + h5g_flags[7] = (int_f)H5L_TYPE_SOFT; + + h5g_flags[8] = (int_f)H5G_STORAGE_TYPE_UNKNOWN; + h5g_flags[9] = (int_f)H5G_STORAGE_TYPE_SYMBOL_TABLE; + h5g_flags[10] = (int_f)H5G_STORAGE_TYPE_COMPACT; + h5g_flags[11] = (int_f)H5G_STORAGE_TYPE_DENSE; /* * H5I flags diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 08a4eb1..ca50e20 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -314,7 +314,7 @@ MODULE H5GLOBAL ! ! H5G flags declaration ! - INTEGER, PARAMETER :: H5G_FLAGS_LEN = 14 + INTEGER, PARAMETER :: H5G_FLAGS_LEN = 12 INTEGER :: H5G_flags(H5G_FLAGS_LEN) !DEC$if defined(BUILD_HDF5_DLL) !DEC$ATTRIBUTES DLLEXPORT :: /H5G_FLAGS/ @@ -340,17 +340,15 @@ MODULE H5GLOBAL EQUIVALENCE(H5G_flags(2), H5G_GROUP_F) ! Object is a group EQUIVALENCE(H5G_flags(3), H5G_DATASET_F) ! Object is a dataset EQUIVALENCE(H5G_flags(4), H5G_TYPE_F) ! Object is a named data type - EQUIVALENCE(H5G_flags(5), H5G_LINK_F) ! Object is a symbolic link - EQUIVALENCE(H5G_flags(6), H5G_UDLINK_F) ! Object is a user-defined link - EQUIVALENCE(H5G_flags(7), H5G_SAME_LOC_F) - EQUIVALENCE(H5G_flags(8), H5G_LINK_ERROR_F) - EQUIVALENCE(H5G_flags(9), H5G_LINK_HARD_F) - EQUIVALENCE(H5G_flags(10), H5G_LINK_SOFT_F) - - EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_UNKNOWN_F ) - EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_SYMBOL_TABLE_F) - EQUIVALENCE(H5G_flags(13), H5G_STORAGE_TYPE_COMPACT_F) - EQUIVALENCE(H5G_flags(14), H5G_STORAGE_TYPE_DENSE_F) + EQUIVALENCE(H5G_flags(5), H5G_SAME_LOC_F) + EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F) + EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F) + EQUIVALENCE(H5G_flags(8), H5G_LINK_SOFT_F) + + EQUIVALENCE(H5G_flags(9), H5G_STORAGE_TYPE_UNKNOWN_F ) + EQUIVALENCE(H5G_flags(10), H5G_STORAGE_TYPE_SYMBOL_TABLE_F) + EQUIVALENCE(H5G_flags(11), H5G_STORAGE_TYPE_COMPACT_F) + EQUIVALENCE(H5G_flags(12), H5G_STORAGE_TYPE_DENSE_F) ! ! H5D flags declaration ! |