diff options
author | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
---|---|---|
committer | Scot Breitenfeld <brtnfld@hdfgroup.org> | 2015-06-02 14:46:51 (GMT) |
commit | f486fe1a495840b0da77a7642a7e572fac3a64b0 (patch) | |
tree | f1e361fa03bb72509736917c7f3ad71cd1f056ce /src/H5AC.c | |
parent | 17a9efa359e335542f84dcedf5d30c87420cbd9d (diff) | |
parent | fc45d5fcb05fbf1b9ee05a46a25afc6fd6c40503 (diff) | |
download | hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.zip hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.gz hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.bz2 |
[svn-r27137] svn merge -r27115:27135 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'src/H5AC.c')
-rw-r--r-- | src/H5AC.c | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2988,12 +2988,12 @@ done: #ifdef H5_HAVE_PARALLEL static herr_t H5AC_check_if_write_permitted(const H5F_t *f, - hid_t UNUSED dxpl_id, + hid_t H5_ATTR_UNUSED dxpl_id, hbool_t * write_permitted_ptr) #else /* H5_HAVE_PARALLEL */ static herr_t -H5AC_check_if_write_permitted(const H5F_t UNUSED * f, - hid_t UNUSED dxpl_id, +H5AC_check_if_write_permitted(const H5F_t H5_ATTR_UNUSED * f, + hid_t H5_ATTR_UNUSED dxpl_id, hbool_t * write_permitted_ptr) #endif /* H5_HAVE_PARALLEL */ { @@ -3561,7 +3561,7 @@ H5AC_log_flushed_entry(H5C_t * cache_ptr, haddr_t addr, hbool_t was_dirty, unsigned flags, - int UNUSED type_id) + int H5_ATTR_UNUSED type_id) { herr_t ret_value = SUCCEED; /* Return value */ hbool_t cleared; |