diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /src/H5Torder.c | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'src/H5Torder.c')
| -rw-r--r-- | src/H5Torder.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/H5Torder.c b/src/H5Torder.c index 590a6c7..35be454 100644 --- a/src/H5Torder.c +++ b/src/H5Torder.c @@ -94,7 +94,7 @@ DESCRIPTION static herr_t H5T_init_order_interface(void) { - FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5T_init_order_interface) + FUNC_ENTER_NOAPI_NOINIT_NOERR FUNC_LEAVE_NOAPI(H5T_init()) } /* H5T_init_order_interface() */ @@ -121,7 +121,7 @@ H5Tget_order(hid_t type_id) H5T_t *dt; /* Datatype to query */ H5T_order_t ret_value; /* Return value */ - FUNC_ENTER_API(H5Tget_order, H5T_ORDER_ERROR) + FUNC_ENTER_API(H5T_ORDER_ERROR) H5TRACE1("To", "i", type_id); /* Check args */ @@ -155,7 +155,7 @@ H5T_get_order(const H5T_t *dtype) { H5T_order_t ret_value = H5T_ORDER_NONE; /* Return value */ - FUNC_ENTER_NOAPI(H5T_get_order, H5T_ORDER_ERROR) + FUNC_ENTER_NOAPI(H5T_ORDER_ERROR) /* Defer to parent */ while(dtype->shared->parent) @@ -228,7 +228,7 @@ H5Tset_order(hid_t type_id, H5T_order_t order) H5T_t *dt; /* Datatype to modify */ herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_API(H5Tset_order, FAIL) + FUNC_ENTER_API(FAIL) H5TRACE2("e", "iTo", type_id, order); /* Check args */ @@ -265,7 +265,7 @@ H5T_set_order(H5T_t *dtype, H5T_order_t order) { herr_t ret_value = SUCCEED; /* Return value */ - FUNC_ENTER_NOAPI(H5T_set_order, FAIL) + FUNC_ENTER_NOAPI(FAIL) if(H5T_ENUM == dtype->shared->type && dtype->shared->u.enumer.nmembs > 0) HGOTO_ERROR(H5E_DATATYPE, H5E_CANTSET, FAIL, "operation not allowed after enum members are defined") |