diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2016-02-25 07:20:54 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2016-02-25 07:20:54 (GMT) |
| commit | 0c7eab89e3c92f979e75bca760c6f45600c800b1 (patch) | |
| tree | 86bfc1c1586661c8089531425acb924a443c167d /test/cache_common.c | |
| parent | 9dff3541bb856810b0048844e80a3008faa16e50 (diff) | |
| download | hdf5-0c7eab89e3c92f979e75bca760c6f45600c800b1.zip hdf5-0c7eab89e3c92f979e75bca760c6f45600c800b1.tar.gz hdf5-0c7eab89e3c92f979e75bca760c6f45600c800b1.tar.bz2 | |
[svn-r29210] Merge of r28950 and 28957 from trunk
Tested on: 64-bit Ubuntu 15.10 (Linux 4.2.0 x86_64) gcc 5.2.1
autotools serial w/ Fortran & C++
autotools parallel (MPICH 3.1.4) w/ Fortran
Diffstat (limited to 'test/cache_common.c')
| -rw-r--r-- | test/cache_common.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/cache_common.c b/test/cache_common.c index 0433f1c..7cbe561 100644 --- a/test/cache_common.c +++ b/test/cache_common.c @@ -3600,7 +3600,7 @@ insert_entry(H5F_t * file_ptr, { H5C_t * cache_ptr; herr_t result; - hid_t xfer = H5AC_ind_dxpl_id; + hid_t xfer = H5AC_dxpl_id; hbool_t insert_pinned; test_entry_t * base_addr; test_entry_t * entry_ptr; @@ -3887,7 +3887,7 @@ protect_entry(H5F_t * file_ptr, test_entry_t * base_addr; test_entry_t * entry_ptr; haddr_t baddrs; - hid_t xfer = H5AC_ind_dxpl_id; + hid_t xfer = H5AC_dxpl_id; H5C_cache_entry_t * cache_entry_ptr; if ( pass ) { |