summaryrefslogtreecommitdiffstats
path: root/src/H5AC.c
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2015-06-08 21:30:38 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2015-06-08 21:30:38 (GMT)
commitdb4acaf3abfcc3e156e7ac575005257ea4e3e065 (patch)
tree0a496cf3d24b757f52133f3ce8e7f2b9e0cbd654 /src/H5AC.c
parent2fdeab0ebde453b113cfab01b6bc32003e6e3275 (diff)
downloadhdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.zip
hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.gz
hdf5-db4acaf3abfcc3e156e7ac575005257ea4e3e065.tar.bz2
[svn-r27165] Merge 27133 & 27158 from trunk:
- Add a new attribute function characterstic for format: * H5_ATTR_FORMAT(X,Y,Z) __attribute__((format(X, Y, Z))) - Rename UNUSED attribute characterstic to H5_ATTR_UNUSED. - Rename NORETURN attribute characterstic to H5_ATTR_NORETURN tested with h5committest.
Diffstat (limited to 'src/H5AC.c')
-rw-r--r--src/H5AC.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/H5AC.c b/src/H5AC.c
index 9771cfc..481d7a1 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -2743,12 +2743,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 */
{
@@ -3316,7 +3316,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;