summaryrefslogtreecommitdiffstats
path: root/testpar
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-02 14:46:51 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-02 14:46:51 (GMT)
commitf486fe1a495840b0da77a7642a7e572fac3a64b0 (patch)
treef1e361fa03bb72509736917c7f3ad71cd1f056ce /testpar
parent17a9efa359e335542f84dcedf5d30c87420cbd9d (diff)
parentfc45d5fcb05fbf1b9ee05a46a25afc6fd6c40503 (diff)
downloadhdf5-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 'testpar')
-rw-r--r--testpar/t_cache.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c
index d36f34f..91c1113 100644
--- a/testpar/t_cache.c
+++ b/testpar/t_cache.c
@@ -373,12 +373,12 @@ static hbool_t serve_rw_count_reset_request(struct mssg_t * mssg_ptr);
/* call back functions & related data structures */
static herr_t clear_datum(H5F_t * f, void * thing, hbool_t dest);
-static herr_t destroy_datum(H5F_t UNUSED * f, void * thing);
-static herr_t flush_datum(H5F_t *f, hid_t UNUSED dxpl_id, hbool_t dest, haddr_t addr,
+static herr_t destroy_datum(H5F_t H5_ATTR_UNUSED * f, void * thing);
+static herr_t flush_datum(H5F_t *f, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t dest, haddr_t addr,
void *thing);
-static void * load_datum(H5F_t UNUSED *f, hid_t UNUSED dxpl_id, haddr_t addr,
- void UNUSED *udata);
-static herr_t size_datum(H5F_t UNUSED * f, void * thing, size_t * size_ptr);
+static void * load_datum(H5F_t H5_ATTR_UNUSED *f, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
+ void H5_ATTR_UNUSED *udata);
+static herr_t size_datum(H5F_t H5_ATTR_UNUSED * f, void * thing, size_t * size_ptr);
#define DATUM_ENTRY_TYPE H5AC_TEST_ID
@@ -2362,7 +2362,7 @@ clear_datum(H5F_t * f,
*-------------------------------------------------------------------------
*/
static herr_t
-destroy_datum(H5F_t UNUSED * f,
+destroy_datum(H5F_t H5_ATTR_UNUSED * f,
void * thing)
{
int idx;
@@ -2411,9 +2411,9 @@ destroy_datum(H5F_t UNUSED * f,
*/
static herr_t
flush_datum(H5F_t *f,
- hid_t UNUSED dxpl_id,
+ hid_t H5_ATTR_UNUSED dxpl_id,
hbool_t dest,
- haddr_t UNUSED addr,
+ haddr_t H5_ATTR_UNUSED addr,
void *thing)
{
const char * fcn_name = "flush_datum()";
@@ -2569,10 +2569,10 @@ flush_datum(H5F_t *f,
*/
static void *
-load_datum(H5F_t UNUSED *f,
- hid_t UNUSED dxpl_id,
+load_datum(H5F_t H5_ATTR_UNUSED *f,
+ hid_t H5_ATTR_UNUSED dxpl_id,
haddr_t addr,
- void UNUSED *udata)
+ void H5_ATTR_UNUSED *udata)
{
const char * fcn_name = "load_datum()";
hbool_t success = TRUE;
@@ -2747,7 +2747,7 @@ load_datum(H5F_t UNUSED *f,
*/
static herr_t
-size_datum(H5F_t UNUSED * f,
+size_datum(H5F_t H5_ATTR_UNUSED * f,
void * thing,
size_t * size_ptr)
{