diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2012-03-21 15:10:17 (GMT) |
| commit | eb89d7b53ab95623ab454186a602e1cafc7391f0 (patch) | |
| tree | ceafe458b3011e38853e765352d3c7e59bbecce1 /test/ntypes.c | |
| parent | 3e468e6ff65d540a439e99ea568a6bff7add7cea (diff) | |
| download | hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.zip hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.gz hdf5-eb89d7b53ab95623ab454186a602e1cafc7391f0.tar.bz2 | |
[svn-r22105] Description:
Bring r20557:22085 from trunk to this branch, also fixing some other
issues/failures in the branch simultaneously. The h5repack tests are still
failing, but Neil will be checking into those, so the branch can be fully
functional again.
Tested on:
Mac OSX/64 10.7.3 (amazon) w/debug
Diffstat (limited to 'test/ntypes.c')
| -rw-r--r-- | test/ntypes.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/ntypes.c b/test/ntypes.c index 3310a82..165d21b 100644 --- a/test/ntypes.c +++ b/test/ntypes.c @@ -331,7 +331,7 @@ test_compound_dtype2(hid_t file) temp_point->st.c2 = (short)(i + j); temp_point->st.l2 = (i * 5 + j * 50) * n; temp_point->st.ll2 = (i * 10 + j * 100) * n; - temp_point->l = (unsigned long long)((i * 100 + j * 1000) * n); + temp_point->l = (unsigned long long)((i * 40 + j * 400) * n); } /* end for */ } /* end for */ @@ -2187,7 +2187,7 @@ test_refer_dtype(hid_t file) TEST_ERROR; /* Open datatype object */ - if((tid1 = H5Rdereference(dataset, H5R_OBJECT, rbuf)) < 0) + if((tid1 = H5Rdereference2(dataset, H5P_DEFAULT, H5R_OBJECT, rbuf)) < 0) TEST_ERROR; /* Verify correct datatype */ @@ -2372,7 +2372,7 @@ test_refer_dtype2(hid_t file) TEST_ERROR; /* Try to open objects */ - if((dset2 = H5Rdereference(dset1, H5R_DATASET_REGION, &rbuf)) < 0) + if((dset2 = H5Rdereference2(dset1, H5P_DEFAULT, H5R_DATASET_REGION, &rbuf)) < 0) TEST_ERROR; /* Check what H5Rget_obj_type2 function returns */ |