diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-22 21:07:54 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-01-22 21:07:54 (GMT) |
commit | dc41c7371153fc4cf7bba6cf09868a03f19e445a (patch) | |
tree | 252c829a898c1bb379301baf9dc1771bd6901e81 /src/H5private.h | |
parent | 681d9231cf2fb1f01ef84c14285195c059d64a16 (diff) | |
download | hdf5-dc41c7371153fc4cf7bba6cf09868a03f19e445a.zip hdf5-dc41c7371153fc4cf7bba6cf09868a03f19e445a.tar.gz hdf5-dc41c7371153fc4cf7bba6cf09868a03f19e445a.tar.bz2 |
[svn-r13167] Description:
Get rid of two different types of fill value struct (merge H5O_fill_t
and H5O_fill_new_t) and clean up & simplify dataset initialization code.
(In preparation for shared object header message method call
refactoring).
Tested on:
FreeBSD/32 6.2 (duty)
Mac OS X/32 10.4.8 (amazon)
Diffstat (limited to 'src/H5private.h')
-rw-r--r-- | src/H5private.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/H5private.h b/src/H5private.h index ada1e0d..8a029cb 100644 --- a/src/H5private.h +++ b/src/H5private.h @@ -474,29 +474,29 @@ * A macro for detecting over/under-flow when casting between types */ #ifndef NDEBUG -#define H5_CHECK_OVERFLOW(var,vartype,casttype) \ -{ \ - casttype _tmp_overflow=(casttype)(var); \ - assert((var)==(vartype)_tmp_overflow); \ +#define H5_CHECK_OVERFLOW(var, vartype, casttype) \ +{ \ + casttype _tmp_overflow = (casttype)(var); \ + assert((var) == (vartype)_tmp_overflow); \ } #else /* NDEBUG */ -#define H5_CHECK_OVERFLOW(var,vartype,casttype) +#define H5_CHECK_OVERFLOW(var, vartype, casttype) #endif /* NDEBUG */ /* * A macro for detecting over/under-flow when assigning between types */ #ifndef NDEBUG -#define H5_ASSIGN_OVERFLOW(var,expr,exprtype,vartype) \ +#define H5_ASSIGN_OVERFLOW(dst, src, srctype, dsttype) \ { \ - exprtype _tmp_overflow=(exprtype)(expr); \ - vartype _tmp_overflow2=(vartype)(_tmp_overflow); \ - assert((vartype)_tmp_overflow==_tmp_overflow2); \ - (var)=_tmp_overflow2; \ + srctype _tmp_overflow = (srctype)(src); \ + dsttype _tmp_overflow2 = (dsttype)(_tmp_overflow); \ + assert((dsttype)_tmp_overflow == _tmp_overflow2); \ + (dst) = _tmp_overflow2; \ } #else /* NDEBUG */ -#define H5_ASSIGN_OVERFLOW(var,expr,exprtype,vartype) \ - (var)=(vartype)(expr); +#define H5_ASSIGN_OVERFLOW(dst, src, srctype, dsttype) \ + (dst) = (dsttype)(src); #endif /* NDEBUG */ /* |