diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-17 20:07:50 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-17 20:07:50 (GMT) |
commit | ea9b094c18566ab2a71458a86f9673451c43fe4d (patch) | |
tree | b1bfde1911eaa817279c821721563325ab19528b /src/H5Tcompound.c | |
parent | e7b55928b6c67dbef4d25bfec34eb0c21f1cb6bc (diff) | |
download | hdf5-ea9b094c18566ab2a71458a86f9673451c43fe4d.zip hdf5-ea9b094c18566ab2a71458a86f9673451c43fe4d.tar.gz hdf5-ea9b094c18566ab2a71458a86f9673451c43fe4d.tar.bz2 |
[svn-r15228] Description:
Bring back revision 15227 from trunk:
Small cleanups to copying datatypes
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-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.5.3 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Tcompound.c')
-rw-r--r-- | src/H5Tcompound.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Tcompound.c b/src/H5Tcompound.c index 660a76d..9942ea1 100644 --- a/src/H5Tcompound.c +++ b/src/H5Tcompound.c @@ -215,7 +215,7 @@ H5Tget_member_type(hid_t type_id, unsigned membno) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a compound datatype") if (membno >= dt->shared->u.compnd.nmembs) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "invalid member number") - if ((memb_dt=H5T_get_member_type(dt, membno))==NULL) + if ((memb_dt=H5T_get_member_type(dt, membno, H5T_COPY_REOPEN))==NULL) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, FAIL, "unable to retrieve member type") if ((ret_value = H5I_register(H5I_DATATYPE, memb_dt)) < 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTREGISTER, FAIL, "unable register datatype atom") @@ -251,7 +251,7 @@ done: *------------------------------------------------------------------------- */ H5T_t * -H5T_get_member_type(const H5T_t *dt, unsigned membno) +H5T_get_member_type(const H5T_t *dt, unsigned membno, H5T_copy_t method) { H5T_t *ret_value = NULL; @@ -261,7 +261,7 @@ H5T_get_member_type(const H5T_t *dt, unsigned membno) assert(membno < dt->shared->u.compnd.nmembs); /* Copy datatype into an atom */ - if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, H5T_COPY_REOPEN))) + if (NULL == (ret_value = H5T_copy(dt->shared->u.compnd.memb[membno].type, method))) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTINIT, NULL, "unable to copy member datatype") done: |