diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 19:55:47 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-06-18 19:55:47 (GMT) |
| commit | f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a (patch) | |
| tree | 72ddbeae8bd36de5762dc45f867672a93d1c37aa /src/H5Tconv.c | |
| parent | 8a75f17670000b64440890e710b2f9053d2ae31e (diff) | |
| download | hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.zip hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.tar.gz hdf5-f1566336ae8a19e34d23e9fc7fa4a9844a6fa26a.tar.bz2 | |
[svn-r15234] Description:
Bring revisions 14800:14900 from trunk into metadata journaling branch
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.2 (amazon) in debug mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Diffstat (limited to 'src/H5Tconv.c')
| -rw-r--r-- | src/H5Tconv.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 0da4d53..7803d07 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -1890,17 +1890,15 @@ H5T_subset_t H5T_conv_struct_subset(const H5T_cdata_t *cdata) { H5T_conv_struct_t *priv; - H5T_subset_t ret_value; /* Return value */ FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_conv_struct_subset) HDassert(cdata); HDassert(cdata->priv); - priv = (H5T_conv_struct_t*)(cdata->priv); - ret_value = priv->smembs_subset; + priv = (H5T_conv_struct_t *)(cdata->priv); - FUNC_LEAVE_NOAPI(ret_value) + FUNC_LEAVE_NOAPI(priv->smembs_subset) } /* end H5T_conv_struct_subset() */ |