diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-30 06:18:56 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2016-05-30 06:18:56 (GMT) |
| commit | a6303ce04cfeb6ba893b0d202ff2af2541db9e38 (patch) | |
| tree | 13679e65090e0ad8ddb6b97ab1be7587f4a8d2e0 /test | |
| parent | bf566b775bbef681e9135c38dbf414df2162cdcc (diff) | |
| download | hdf5-a6303ce04cfeb6ba893b0d202ff2af2541db9e38.zip hdf5-a6303ce04cfeb6ba893b0d202ff2af2541db9e38.tar.gz hdf5-a6303ce04cfeb6ba893b0d202ff2af2541db9e38.tar.bz2 | |
[svn-r29975] Description:
Bring r29909 from revise_chunks to trunk:
Cleaned up "conflicts with C++ keyword" warnings.
Tested on:
MacOSX/64 10.11.5 (amazon) w/serial, parallel & production
(h5committest forthcoming)
Diffstat (limited to 'test')
| -rw-r--r-- | test/tfile.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/test/tfile.c b/test/tfile.c index e763857..74f3b86 100644 --- a/test/tfile.c +++ b/test/tfile.c @@ -2182,7 +2182,7 @@ test_file_double_dataset_open(void) ** *****************************************************************/ static void -test_file_double_file_dataset_open(hbool_t new) +test_file_double_file_dataset_open(hbool_t new_format) { hid_t fapl = -1; /* File access property list */ hid_t dcpl = -1; /* Dataset creation property list */ @@ -2211,10 +2211,10 @@ test_file_double_file_dataset_open(hbool_t new) fapl = H5Pcreate(H5P_FILE_ACCESS); CHECK(fapl, FAIL, "H5Pcreate"); - if(new) { - ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); - CHECK(ret, FAIL, "H5Pset_libver_bounds"); - } + if(new_format) { + ret = H5Pset_libver_bounds(fapl, H5F_LIBVER_LATEST, H5F_LIBVER_LATEST); + CHECK(ret, FAIL, "H5Pset_libver_bounds"); + } /* end if */ /* Create the test file */ fid1 = H5Fcreate(FILE1, H5F_ACC_TRUNC, H5P_DEFAULT, fapl); |