Merge branch 'develop' into hdf5_1_10.sync

1 files changed, 58 insertions, 58 deletions

diff --git a/test/cache.c b/test/cache.c
index 97a1b91..d5e3c6c 100644
--- a/test/cache.c
+++ b/test/cache.c
@@ -3309,7 +3309,7 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
 
         if(result < 0) {
 
@@ -3320,7 +3320,7 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -3331,7 +3331,7 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_CLEAR_ONLY_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_CLEAR_ONLY_FLAG);
 
         if(result < 0) {
 
@@ -3343,7 +3343,7 @@ check_flush_cache__empty_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_MARKED_ENTRIES_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_MARKED_ENTRIES_FLAG);
 
         if(result < 0) {
 
@@ -5014,7 +5014,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, flush_flags);
+        result = H5C_flush_cache(file_ptr, flush_flags);
 
         if(result < 0) {
 
@@ -5088,7 +5088,7 @@ check_flush_cache__multi_entry_test(H5F_t * file_ptr,
     /* clean up the cache to prep for the next test */
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -5245,7 +5245,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, flush_flags);
+        result = H5C_flush_cache(file_ptr, flush_flags);
 
         if(result < 0) {
 
@@ -5319,7 +5319,7 @@ check_flush_cache__pe_multi_entry_test(H5F_t * file_ptr,
     /* clean up the cache to prep for the next test */
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -9322,7 +9322,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, flush_flags);
+        result = H5C_flush_cache(file_ptr, flush_flags);
 
         if(result < 0) {
 
@@ -9514,7 +9514,7 @@ check_flush_cache__flush_op_test(H5F_t * file_ptr,
     /* clean up the cache to prep for the next test */
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -10793,7 +10793,7 @@ check_flush_cache__flush_op_eviction_test(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -12522,7 +12522,7 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, flush_flags);
+        result = H5C_flush_cache(file_ptr, flush_flags);
 
         if(result < 0) {
 
@@ -12581,7 +12581,7 @@ check_flush_cache__single_entry_test(H5F_t * file_ptr,
     /* clean up the cache to prep for the next test */
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -12714,7 +12714,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, flush_flags);
+        result = H5C_flush_cache(file_ptr, flush_flags);
 
         if(result < 0) {
 
@@ -12789,7 +12789,7 @@ check_flush_cache__pinned_single_entry_test(H5F_t * file_ptr,
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -14351,7 +14351,7 @@ check_resize_entry(unsigned paged)
 
         } else {
 
-            result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+            result = H5C_unprotect(file_ptr,
                        entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
             if(result < 0) {
@@ -14436,7 +14436,7 @@ check_resize_entry(unsigned paged)
 
         } else {
 
-            result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+            result = H5C_unprotect(file_ptr,
                        entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
             if(result < 0) {
@@ -14796,7 +14796,7 @@ check_resize_entry(unsigned paged)
 
         } else {
 
-            result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+            result = H5C_unprotect(file_ptr,
                        entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
             if(result < 0) {
@@ -14883,7 +14883,7 @@ check_resize_entry(unsigned paged)
 
         } else {
 
-            result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+            result = H5C_unprotect(file_ptr,
                        entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
             if(result < 0) {
@@ -15956,7 +15956,7 @@ check_flush_protected_err(unsigned paged)
 
         protect_entry(file_ptr, 0, 0);
 
-        if(H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET) >= 0) {
+        if(H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET) >= 0) {
 
             pass = FALSE;
             failure_mssg = "flush succeeded on cache with protected entry.\n";
@@ -15965,7 +15965,7 @@ check_flush_protected_err(unsigned paged)
 
             unprotect_entry(file_ptr, 0, 0, H5C__DIRTIED_FLAG);
 
-            if(H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET) < 0) {
+            if(H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET) < 0) {
 
                 pass = FALSE;
                 failure_mssg = "flush failed after unprotect.\n";
@@ -16032,19 +16032,19 @@ check_destroy_pinned_err(unsigned paged)
         protect_entry(file_ptr, 0, 0);
 	unprotect_entry(file_ptr, 0, 0, H5C__PIN_ENTRY_FLAG);
 
-        if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0) {
+        if(H5C_prep_for_file_close(file_ptr) < 0) {
             pass = FALSE;
             failure_mssg = "unexpected failure of prep for file close.\n";
         } /* end if */
 
-        if(H5C_dest(file_ptr, H5AC_ind_read_dxpl_id) >= 0) {
+        if(H5C_dest(file_ptr) >= 0) {
             pass = FALSE;
             failure_mssg = "destroy succeeded on cache with pinned entry.\n";
         } /* end if */
 	else {
 	    unpin_entry(0, 0);
 
-            if(H5C_dest(file_ptr, H5AC_ind_read_dxpl_id) < 0) {
+            if(H5C_dest(file_ptr) < 0) {
                 pass = FALSE;
                 failure_mssg = "destroy failed after unpin.\n";
             } /* end if */
@@ -16122,20 +16122,20 @@ check_destroy_protected_err(unsigned paged)
          * we are trying to test, put the call to H5C_prep_for_file_close()
          * prior to the final protect call.
          */
-        if(H5C_prep_for_file_close(file_ptr, H5P_DATASET_XFER_DEFAULT) < 0) {
+        if(H5C_prep_for_file_close(file_ptr) < 0) {
             pass = FALSE;
             failure_mssg = "unexpected failure of prep for file close.\n";
         } /* end if */
 
         protect_entry(file_ptr, 0, 0);
 
-        if(H5C_dest(file_ptr, H5AC_ind_read_dxpl_id) >= 0) {
+        if(H5C_dest(file_ptr) >= 0) {
             pass = FALSE;
             failure_mssg = "destroy succeeded on cache with protected entry.\n";
         } /* end if */
 	else {
             unprotect_entry(file_ptr, 0, 0, H5C__DIRTIED_FLAG);
-            if(H5C_dest(file_ptr, H5AC_ind_read_dxpl_id) < 0) {
+            if(H5C_dest(file_ptr) < 0) {
                 pass = FALSE;
                 failure_mssg = "destroy failed after unprotect.\n";
             } /* end if */
@@ -16215,7 +16215,7 @@ check_duplicate_insert_err(unsigned paged)
             base_addr = entries[0];
             entry_ptr = &(base_addr[0]);
 
-            result = H5C_insert_entry(file_ptr, H5AC_ind_read_dxpl_id,
+            result = H5C_insert_entry(file_ptr,
                                       types[0], entry_ptr->addr,
                                       (void *)entry_ptr, H5C__NO_FLAGS_SET);
 
@@ -16301,7 +16301,7 @@ check_double_pin_err(unsigned paged)
 
     if(pass) {
 
-        result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+        result = H5C_unprotect(file_ptr,
                     entry_ptr->addr, (void *)entry_ptr, H5C__PIN_ENTRY_FLAG);
 
         if(result > 0) {
@@ -16387,7 +16387,7 @@ check_double_unpin_err(unsigned paged)
 
     if(pass) {
 
-        result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+        result = H5C_unprotect(file_ptr,
                     entry_ptr->addr, (void *)entry_ptr, H5C__UNPIN_ENTRY_FLAG);
 
         if(result > 0) {
@@ -16591,7 +16591,7 @@ check_double_protect_err(unsigned paged)
 
     if(pass) {
 
-        cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, H5AC_ind_read_dxpl_id,
+        cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
 			               types[0], entry_ptr->addr,
 				       &entry_ptr->addr, H5C__NO_FLAGS_SET);
 
@@ -16673,7 +16673,7 @@ check_double_unprotect_err(unsigned paged)
 
     if(pass) {
 
-        result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+        result = H5C_unprotect(file_ptr,
                     entry_ptr->addr, (void *)entry_ptr, H5C__NO_FLAGS_SET);
 
         if(result > 0) {
@@ -16841,7 +16841,7 @@ check_expunge_entry_errs(unsigned paged)
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr, H5AC_ind_read_dxpl_id,
+	result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result > 0) {
@@ -16859,7 +16859,7 @@ check_expunge_entry_errs(unsigned paged)
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr, H5AC_ind_read_dxpl_id,
+	result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result > 0) {
@@ -16877,7 +16877,7 @@ check_expunge_entry_errs(unsigned paged)
 
     if(pass) {
 
-	result = H5C_expunge_entry(file_ptr, H5AC_ind_read_dxpl_id,
+	result = H5C_expunge_entry(file_ptr,
                 types[0], entry_ptr->addr, H5C__NO_FLAGS_SET);
 
         if(result < 0) {
@@ -17174,7 +17174,7 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
     if(pass) {
 
-        result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+        result = H5C_unprotect(file_ptr,
                     entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
         if(result >= 0) {
@@ -17216,7 +17216,7 @@ check_unprotect_ro_dirty_err(unsigned paged)
 
     if(pass) {
 
-        result = H5C_unprotect(file_ptr, H5AC_ind_read_dxpl_id,
+        result = H5C_unprotect(file_ptr,
                     entry_ptr->addr, (void *)entry_ptr, H5C__DIRTIED_FLAG);
 
         if(result > 0) {
@@ -17303,7 +17303,7 @@ check_protect_ro_rw_err(unsigned paged)
 
     if(pass) {
 
-        thing_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, H5AC_ind_read_dxpl_id,
+        thing_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
 			         types[0], entry_ptr->addr,
 				 &entry_ptr->addr, H5C__NO_FLAGS_SET);
 
@@ -17398,7 +17398,7 @@ check_protect_retries(unsigned paged)
         entry_ptr->max_verify_ct = 3;
         entry_ptr->verify_ct = 0;
 
-	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, H5AC_ind_read_dxpl_id,
+	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
                 types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG);
 
 	if((cache_entry_ptr != (void *)entry_ptr) ||
@@ -17443,7 +17443,7 @@ check_protect_retries(unsigned paged)
         entry_ptr->max_verify_ct = 11;
         entry_ptr->verify_ct = 0;
 
-	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr, H5AC_ind_read_dxpl_id,
+	cache_entry_ptr = (H5C_cache_entry_t *)H5C_protect(file_ptr,
                 types[type], entry_ptr->addr, &entry_ptr->addr, H5C__READ_ONLY_FLAG);
 
 	/* H5C_protect() should fail after all retries fail */
@@ -31018,7 +31018,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31124,7 +31124,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31236,7 +31236,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31355,7 +31355,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31531,7 +31531,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31741,7 +31741,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -31899,7 +31899,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -32033,7 +32033,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -32226,7 +32226,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -32465,7 +32465,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -32722,7 +32722,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -33009,7 +33009,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -33325,7 +33325,7 @@ check_flush_deps_order(unsigned paged)
         /* Reset index for tracking flush order */
         flush_order = 0;
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__NO_FLAGS_SET);
+        result = H5C_flush_cache(file_ptr, H5C__NO_FLAGS_SET);
         if(result < 0) CACHE_ERROR("flushing entries with flush dependendices")
 
         /* Change expected values, and verify the status of the entries
@@ -34663,7 +34663,7 @@ cedds__expunge_dirty_entry_in_flush_test(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -35015,7 +35015,7 @@ cedds__H5C_make_space_in_cache(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -35451,7 +35451,7 @@ cedds__H5C__autoadjust__ageout__evict_aged_out_entries(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -35838,7 +35838,7 @@ cedds__H5C_flush_invalidate_cache__bucket_scan(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {
 
@@ -36311,7 +36311,7 @@ check_stats__smoke_check_1(H5F_t * file_ptr)
 
     if(pass) {
 
-        result = H5C_flush_cache(file_ptr, H5AC_ind_read_dxpl_id, H5C__FLUSH_INVALIDATE_FLAG);
+        result = H5C_flush_cache(file_ptr, H5C__FLUSH_INVALIDATE_FLAG);
 
         if(result < 0) {