diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2008-11-17 22:24:23 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-11-17 22:24:23 (GMT) |
commit | e012505802452518fff2cb17bfbb546a702ac9a9 (patch) | |
tree | 8a1c5d0da1836d8fb4c0bfe522e491986983c41a | |
parent | 29be5ec598f9f321051f05af07f36eeb2a28c548 (diff) | |
download | hdf5-e012505802452518fff2cb17bfbb546a702ac9a9.zip hdf5-e012505802452518fff2cb17bfbb546a702ac9a9.tar.gz hdf5-e012505802452518fff2cb17bfbb546a702ac9a9.tar.bz2 |
[svn-r16092] Description:
Switch H5Gcreate -> H5Gcreate2 and H5Gopen -> H5Gopen2, so that they aren't
switched with the API compability flags are changed
Tested on:
Mac OS X/32 10.5.5 (amazon)
Linux/64 2.4 (smirom) w/API compability
-rw-r--r-- | test/mount.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/test/mount.c b/test/mount.c index 77ec3b6..492f490 100644 --- a/test/mount.c +++ b/test/mount.c @@ -4237,24 +4237,24 @@ test_multisharedclose(hid_t fapl) /* Create master file with three groups to serve as mount points */ if ((fid1 = H5Fcreate(filename4, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "mnt2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "mnt3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "mnt1", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "mnt2", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "mnt3", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR if (H5Fclose(fid1) < 0) TEST_ERROR /* Create child file with group */ if ((fid1 = H5Fcreate(filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR if (H5Fclose(fid1) < 0) TEST_ERROR /* Create child file with group */ if ((fid1 = H5Fcreate(filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR if (H5Fclose(fid1) < 0) TEST_ERROR /* Create child file with group */ if ((fid1 = H5Fcreate(filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR - if (H5Gclose(H5Gcreate(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR + if (H5Gclose(H5Gcreate2(fid1, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR if (H5Fclose(fid1) < 0) TEST_ERROR @@ -4264,7 +4264,7 @@ test_multisharedclose(hid_t fapl) if (H5Fmount(fid1, "mnt1", fid2, H5P_DEFAULT) < 0) TEST_ERROR /* Open the group in child 1 */ - if ((gid1 = H5Gopen(fid1, "mnt1/grp", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid1 = H5Gopen2(fid1, "mnt1/grp", H5P_DEFAULT)) < 0) TEST_ERROR /* Close both files. They will be held open by gid1 */ if (H5Idec_ref(fid2) < 0) TEST_ERROR @@ -4277,7 +4277,7 @@ test_multisharedclose(hid_t fapl) if (H5Fmount(fid1, "mnt2", fid2, H5P_DEFAULT) < 0) TEST_ERROR /* Open the group in child 2 */ - if ((gid2 = H5Gopen(fid1, "mnt2/grp", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid2 = H5Gopen2(fid1, "mnt2/grp", H5P_DEFAULT)) < 0) TEST_ERROR /* Close both files. They will be held open by gid2 */ if (H5Idec_ref(fid2) < 0) TEST_ERROR @@ -4290,7 +4290,7 @@ test_multisharedclose(hid_t fapl) if (H5Fmount(fid1, "mnt3", fid2, H5P_DEFAULT) < 0) TEST_ERROR /* Open the group in child 3 */ - if ((gid3 = H5Gopen(fid1, "mnt3/grp", H5P_DEFAULT)) < 0) TEST_ERROR + if ((gid3 = H5Gopen2(fid1, "mnt3/grp", H5P_DEFAULT)) < 0) TEST_ERROR /* Close both files. They will be held open by gid3 */ if (H5Idec_ref(fid2) < 0) TEST_ERROR |