diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-12-17 22:38:50 (GMT) |
| commit | 80385ab8dd171a8410bd8e7dfce0e6b679c3fc97 (patch) | |
| tree | f3ed5401e74382b5f316a7057c091d6c336ef0a1 /src/H5Tdeprec.c | |
| parent | 0db6255d805b625f3fbbbb0b0893032af229d234 (diff) | |
| download | hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.zip hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.gz hdf5-80385ab8dd171a8410bd8e7dfce0e6b679c3fc97.tar.bz2 | |
[svn-r18032] Description:
Bring r18031 from trunk to 1.8 branch:
Bring r18030 from merge_metadata_journaling branch to trunk:
Bring "brush clearing" changes (whitespace & style issues, mostly) from
metadata_journaling branch to the "merging" branch, to converge the trunk and
the metadata_journaling branch.
Also, some other minor cleanups along the way.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Tdeprec.c')
| -rw-r--r-- | src/H5Tdeprec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Tdeprec.c b/src/H5Tdeprec.c index 0314a38..9d9ad36 100644 --- a/src/H5Tdeprec.c +++ b/src/H5Tdeprec.c @@ -136,7 +136,7 @@ H5Tcommit1(hid_t loc_id, const char *name, hid_t type_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a location") if(!name || !*name) HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name") - if(NULL == (type = H5I_object_verify(type_id, H5I_DATATYPE))) + if(NULL == (type = (H5T_t *)H5I_object_verify(type_id, H5I_DATATYPE))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a datatype") /* Commit the datatype to the file, using default property list values */ |