diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-25 22:18:33 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-09-25 22:18:33 (GMT) |
| commit | 68c01f91d94d1fa7a7cff198cb8daf6c89f05da7 (patch) | |
| tree | 8035fe4ed2f2a10855575c91969e4107af382d46 /fortran | |
| parent | 02296972ec8a90ad50d89786755d0e953e95b455 (diff) | |
| download | hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.zip hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.tar.gz hdf5-68c01f91d94d1fa7a7cff198cb8daf6c89f05da7.tar.bz2 | |
[svn-r14154] Description:
Finish deprecating last H5G symbol (H5G_obj_t) - yay!
Lots of misc. library fixes to remove confusion between links and
objects. The tools could still use another pass, to remove h5trav_type_t type
and make the correct distinction between links & objects.
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
AIX/32 5.3 (copper) w/FORTRAN, w/parallel, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'fortran')
| -rw-r--r-- | fortran/src/H5_f.c | 12 | ||||
| -rw-r--r-- | fortran/src/H5f90global.f90 | 2 | ||||
| -rw-r--r-- | fortran/test/tH5G.f90 | 1 |
3 files changed, 10 insertions, 5 deletions
diff --git a/fortran/src/H5_f.c b/fortran/src/H5_f.c index d96865f..5464786 100644 --- a/fortran/src/H5_f.c +++ b/fortran/src/H5_f.c @@ -298,11 +298,13 @@ nh5init_flags_c( int_f *h5d_flags, int_f *h5f_flags, * H5G flags */ - h5g_flags[0] = H5G_UNKNOWN; - h5g_flags[1] = H5G_GROUP; - h5g_flags[2] = H5G_DATASET; - h5g_flags[3] = H5G_TYPE; - h5g_flags[4] = H5G_LINK; + h5g_flags[0] = H5O_TYPE_UNKNOWN; + h5g_flags[1] = H5O_TYPE_GROUP; + h5g_flags[2] = H5O_TYPE_DATASET; + h5g_flags[3] = H5O_TYPE_NAMED_DATATYPE; +/* This value can no longer be returned and all these flags should be updated + * to reflect the refinements between links and objects. -QAK */ +/* h5g_flags[4] = H5G_LINK; */ h5g_flags[5] = H5L_TYPE_ERROR; h5g_flags[6] = H5L_TYPE_HARD; h5g_flags[7] = H5L_TYPE_SOFT; diff --git a/fortran/src/H5f90global.f90 b/fortran/src/H5f90global.f90 index 0cb0268..0b429e4 100644 --- a/fortran/src/H5f90global.f90 +++ b/fortran/src/H5f90global.f90 @@ -205,6 +205,7 @@ INTEGER :: H5G_GROUP_F INTEGER :: H5G_DATASET_F INTEGER :: H5G_TYPE_F +! XXX: Fix problems with H5G_LINK_F! - QAK INTEGER :: H5G_LINK_F INTEGER :: H5G_LINK_ERROR_F INTEGER :: H5G_LINK_HARD_F @@ -214,6 +215,7 @@ EQUIVALENCE(H5G_flags(2), H5G_GROUP_F) EQUIVALENCE(H5G_flags(3), H5G_DATASET_F) EQUIVALENCE(H5G_flags(4), H5G_TYPE_F) +! XXX: Fix problems with H5G_LINK_F! - QAK EQUIVALENCE(H5G_flags(5), H5G_LINK_F) EQUIVALENCE(H5G_flags(6), H5G_LINK_ERROR_F) EQUIVALENCE(H5G_flags(7), H5G_LINK_HARD_F) diff --git a/fortran/test/tH5G.f90 b/fortran/test/tH5G.f90 index 40263d6..437970f 100644 --- a/fortran/test/tH5G.f90 +++ b/fortran/test/tH5G.f90 @@ -151,6 +151,7 @@ ! ! CALL h5gget_obj_info_idx_f(file_id, linkname1, 2, name, obj_type, error) ! CALL check("h5gget_obj_info_idx_f", error, total_error) +! XXX: Fix problems with H5G_LINK_F! - QAK ! if (obj_type .ne. H5G_LINK_F) then ! write(*,*) "got object ", name, " type error ", obj_type ! total_error = total_error +1 |