diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-16 20:28:44 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-07-16 20:28:44 (GMT) |
| commit | 43995f12ac694455b3ca42292eb8cea15c08817e (patch) | |
| tree | aec930ca82315c1dec81579aff20bc12c1db67db /src/H5AC.c | |
| parent | 0f43d84b3c7292bfb7d51218f02738028f818ff0 (diff) | |
| download | hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.zip hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.tar.gz hdf5-43995f12ac694455b3ca42292eb8cea15c08817e.tar.bz2 | |
[svn-r22583] Description:
Bring r22582 from trunk to 1.8 branch:
Refactor ID class registration to be more like how other "class"s in the
library are registered, and clean up compiler warnings.
Tested on:
Mac OSX/64 10.7.4 (amazon) w/debug
(Too minor to require h5comittest)
Diffstat (limited to 'src/H5AC.c')
| -rw-r--r-- | src/H5AC.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -342,14 +342,14 @@ done: FUNC_LEAVE_NOAPI(ret_value) #else /* H5_HAVE_PARALLEL */ - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR /* Sanity check */ - assert(H5P_LST_DATASET_XFER_g!=(-1)); + HDassert(H5P_LST_DATASET_XFER_g!=(-1)); - H5AC_dxpl_id=H5P_DATASET_XFER_DEFAULT; - H5AC_noblock_dxpl_id=H5P_DATASET_XFER_DEFAULT; - H5AC_ind_dxpl_id=H5P_DATASET_XFER_DEFAULT; + H5AC_dxpl_id = H5P_DATASET_XFER_DEFAULT; + H5AC_noblock_dxpl_id = H5P_DATASET_XFER_DEFAULT; + H5AC_ind_dxpl_id = H5P_DATASET_XFER_DEFAULT; FUNC_LEAVE_NOAPI(SUCCEED) #endif /* H5_HAVE_PARALLEL */ @@ -376,7 +376,7 @@ H5AC_term_interface(void) { int n = 0; - FUNC_ENTER_NOAPI_NOINIT + FUNC_ENTER_NOAPI_NOINIT_NOERR if (H5_interface_initialize_g) { #ifdef H5_HAVE_PARALLEL |