[svn-r29842] Description:

    Bring [appropriate portions of] r29811, 29813, 29826, 29830, 29831 from
revise_chunks branch to the trunk.

Tested on:
    MacOSX/64 10.11.4 (amazon) w/serial, parallel & production
    (h5committest forthcoming)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/H5AC.c b/src/H5AC.c
index 64edc87..6a71f29 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -941,7 +941,11 @@ done:
  */
 herr_t
 H5AC_move_entry(H5F_t *f, const H5AC_class_t *type, haddr_t old_addr, 
-                haddr_t new_addr, hid_t dxpl_id)
+                haddr_t new_addr, hid_t 
+#ifndef H5_HAVE_PARALLEL
+H5_ATTR_UNUSED
+#endif /* H5_HAVE_PARALLEL */
+                dxpl_id)
 {
 #if H5AC__TRACE_FILE_ENABLED
     char          	trace[128] = "";