diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-06-11 19:18:52 (GMT) |
| commit | aa4e3e3985e1e2715819c326d332e1569ac73c7b (patch) | |
| tree | 77a9a9305e54d10f2937f142e4568395ee0f9208 /src/H5Dint.c | |
| parent | bf8942c7e9213355515344f21c8df7fd2987f09d (diff) | |
| parent | b9f2a18b5ae9adf23cac4c0336291373a25f0721 (diff) | |
| download | hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.zip hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.gz hdf5-aa4e3e3985e1e2715819c326d332e1569ac73c7b.tar.bz2 | |
[svn-r27191] Merged r26781 to r27185 from trunk
Tested on: 64-bit Ubuntu Linux VM w/ gcc 4.8.2
(C++ and Fortran 2003 also tested)
Diffstat (limited to 'src/H5Dint.c')
| -rw-r--r-- | src/H5Dint.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5Dint.c b/src/H5Dint.c index 69f2d81..10fa4ca 100644 --- a/src/H5Dint.c +++ b/src/H5Dint.c @@ -2212,7 +2212,7 @@ H5D__vlen_get_buf_size_alloc(size_t size, void *info) */ /* ARGSUSED */ herr_t -H5D__vlen_get_buf_size(void UNUSED *elem, hid_t type_id, unsigned UNUSED ndim, const hsize_t *point, void *op_data) +H5D__vlen_get_buf_size(void H5_ATTR_UNUSED *elem, hid_t type_id, unsigned H5_ATTR_UNUSED ndim, const hsize_t *point, void *op_data) { H5D_vlen_bufsize_t *vlen_bufsize = (H5D_vlen_bufsize_t *)op_data; H5T_t *dt; /* Datatype for operation */ @@ -2570,7 +2570,7 @@ done: *------------------------------------------------------------------------- */ herr_t -H5D__mark(const H5D_t *dataset, hid_t UNUSED dxpl_id, unsigned flags) +H5D__mark(const H5D_t *dataset, hid_t H5_ATTR_UNUSED dxpl_id, unsigned flags) { herr_t ret_value = SUCCEED; /* Return value */ @@ -2604,7 +2604,7 @@ H5D__mark(const H5D_t *dataset, hid_t UNUSED dxpl_id, unsigned flags) *------------------------------------------------------------------------- */ static int -H5D__flush_cb(void *_dataset, hid_t UNUSED id, void *_udata) +H5D__flush_cb(void *_dataset, hid_t H5_ATTR_UNUSED id, void *_udata) { H5D_t *dataset = (H5D_t *)_dataset; /* Dataset pointer */ H5D_flush_ud_t *udata = (H5D_flush_ud_t *)_udata; /* User data for callback */ |