From 5226ae644937873a75762f723af0ba42095d7586 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 19 Jul 2011 20:54:36 -0500 Subject: [svn-r21128] Description: Bring r21127 from trunk to 1.8 branch: Correct to use correct FAPL, to fix error when running 'make check-vfd' Tested on: Linux/64 2.6 (koala) w/make check-vfd FreeBSD/32 8.2 (loyalty) w/debug (h5committested on trunk) --- test/dtypes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/dtypes.c b/test/dtypes.c index 184cbf7..2f73627 100644 --- a/test/dtypes.c +++ b/test/dtypes.c @@ -6757,8 +6757,8 @@ test_delete_obj_named(hid_t fapl) create_del_obj_named_test_file(filename, fapl, new_format); /* Test deleting dataset opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR if((dset = H5Dopen2(filea1, DEL_OBJ_NAMED_DATASET, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR if(H5Dclose(dset) < 0) FAIL_STACK_ERROR @@ -6777,8 +6777,8 @@ test_delete_obj_named(hid_t fapl) create_del_obj_named_test_file(filename, fapl, new_format); /* Test deleting attribute opened through different file ID */ - if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR - if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR + if((filea1 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR + if((filea2 = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0) FAIL_STACK_ERROR if((attr = H5Aopen_by_name(filea1, DEL_OBJ_NAMED_DATASET, DEL_OBJ_NAMED_ATTRIBUTE, H5P_DEFAULT, H5P_DEFAULT)) < 0) FAIL_STACK_ERROR if(H5Aclose(attr) < 0) FAIL_STACK_ERROR -- cgit v0.12