summaryrefslogtreecommitdiffstats
path: root/src/H5Pint.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2016-02-10 17:55:55 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2016-02-10 17:55:55 (GMT)
commitc8a6c6030a768952bc4161b2bf30c948b8b58723 (patch)
tree064e57faf3f85c030d70900c3354fee2fbffd8ac /src/H5Pint.c
parentf1283d59b061cde641f2c24d23f01efbca46ad2f (diff)
downloadhdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.zip
hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.gz
hdf5-c8a6c6030a768952bc4161b2bf30c948b8b58723.tar.bz2
[svn-r29077] Description:
Normalize against the trunk, in preparation for final merge. Tested on: MacOSX/64 10.11.3 (amazon) w/serial & parallel (h5committest not required on this branch)
Diffstat (limited to 'src/H5Pint.c')
-rw-r--r--src/H5Pint.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/H5Pint.c b/src/H5Pint.c
index 3c145c5..a222082 100644
--- a/src/H5Pint.c
+++ b/src/H5Pint.c
@@ -29,7 +29,9 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5ACprivate.h" /* Metadata cache */
+#ifdef H5_HAVE_PARALLEL
+#include "H5ACprivate.h" /* Metadata cache */
+#endif /* H5_HAVE_PARALLEL */
#include "H5Eprivate.h" /* Error handling */
#include "H5Fprivate.h" /* File access */
#include "H5FLprivate.h" /* Free lists */
@@ -5452,7 +5454,15 @@ H5P_get_class(const H5P_genplist_t *plist)
*/
herr_t
H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *dxpl_id,
- hid_t loc_id, hbool_t is_collective)
+ hid_t
+#ifndef H5_HAVE_PARALLEL
+ H5_ATTR_UNUSED
+#endif /* H5_HAVE_PARALLEL */
+ loc_id, hbool_t
+#ifndef H5_HAVE_PARALLEL
+ H5_ATTR_UNUSED
+#endif /* H5_HAVE_PARALLEL */
+ is_collective)
{
herr_t ret_value = SUCCEED; /* Return value */
@@ -5495,8 +5505,6 @@ H5P_verify_apl_and_dxpl(hid_t *acspl_id, const H5P_libclass_t *libclass, hid_t *
if(TRUE != H5P_isa_class(*acspl_id, *libclass->class_id))
HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not the required access property list")
- *dxpl_id = H5AC_ind_read_dxpl_id;
-
#ifdef H5_HAVE_PARALLEL
/* Get the plist structure for the access property list */
if(NULL == (plist = (H5P_genplist_t *)H5I_object(*acspl_id)))