summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-08-31 17:42:09 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-08-31 17:42:09 (GMT)
commitb920ee876e4854f7e770f21c04126a208fb3b1af (patch)
tree86ecc7e08f88e952369085c4a3dd55e04e0b4c68
parent74792949c9beb0c090764c5e42f7f6994abf4b3a (diff)
downloadhdf5-b920ee876e4854f7e770f21c04126a208fb3b1af.zip
hdf5-b920ee876e4854f7e770f21c04126a208fb3b1af.tar.gz
hdf5-b920ee876e4854f7e770f21c04126a208fb3b1af.tar.bz2
[svn-r27623] Added some parallel #ifdefs to H5Ocache.c to quiet compiler
warnings. tested on: h5committest
-rw-r--r--src/H5Ocache.c22
1 files changed, 21 insertions, 1 deletions
diff --git a/src/H5Ocache.c b/src/H5Ocache.c
index 203d0fc..3c64131 100644
--- a/src/H5Ocache.c
+++ b/src/H5Ocache.c
@@ -636,13 +636,21 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5O__cache_clear(const H5F_t *f, void *_thing, hbool_t about_to_destroy)
+#ifdef H5_HAVE_PARALLEL
+H5O__cache_clear(const H5F_t *f, void *_thing, hbool_t H5_ATTR_UNUSED about_to_destroy)
+#else
+H5O__cache_clear(const H5F_t H5_ATTR_UNUSED *f, void *_thing, hbool_t H5_ATTR_UNUSED about_to_destroy)
+#endif /* H5_HAVE_PARALLEL */
{
H5O_t *oh = (H5O_t *)_thing; /* Object header to reset */
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
+#ifdef H5_HAVE_PARALLEL
FUNC_ENTER_STATIC
+#else
+ FUNC_ENTER_STATIC_NOERR
+#endif /* H5_HAVE_PARALLEL */
/* Check arguments */
HDassert(oh);
@@ -673,7 +681,9 @@ H5O__cache_clear(const H5F_t *f, void *_thing, hbool_t about_to_destroy)
oh->ndecode_dirtied = 0;
#endif /* NDEBUG */
+#ifdef H5_HAVE_PARALLEL
done:
+#endif /* H5_HAVE_PARALLEL */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O__cache_clear() */
@@ -942,14 +952,22 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
+#ifdef H5_HAVE_PARALLEL
H5O__cache_chk_clear(const H5F_t *f, void *_thing, hbool_t about_to_destroy)
+#else
+H5O__cache_chk_clear(const H5F_t H5_ATTR_UNUSED *f, void *_thing, hbool_t H5_ATTR_UNUSED about_to_destroy)
+#endif /* H5_HAVE_PARALLEL */
{
H5O_chunk_proxy_t *chk_proxy = (H5O_chunk_proxy_t *)_thing; /* Object header chunk to reset */
H5O_t *oh; /* Object header for chunk */
unsigned u; /* Local index variable */
herr_t ret_value = SUCCEED; /* Return value */
+#ifdef H5_HAVE_PARALLEL
FUNC_ENTER_STATIC
+#else
+ FUNC_ENTER_STATIC_NOERR
+#endif /* H5_HAVE_PARALLEL */
/* Check arguments */
HDassert(chk_proxy);
@@ -971,7 +989,9 @@ H5O__cache_chk_clear(const H5F_t *f, void *_thing, hbool_t about_to_destroy)
if(chk_proxy->oh->mesg[u].chunkno == chk_proxy->chunkno)
chk_proxy->oh->mesg[u].dirty = FALSE;
+#ifdef H5_HAVE_PARALLEL
done:
+#endif /* H5_HAVE_PARALLEL */
FUNC_LEAVE_NOAPI(ret_value)
} /* end H5O__cache_chk_clear() */