summaryrefslogtreecommitdiffstats
path: root/test/trefer.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2003-07-07 19:02:46 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2003-07-07 19:02:46 (GMT)
commit4e23c807585ed705173f32e374884a46e4a4f2dd (patch)
treedf458773252f84a19720b4d8b3588db955f4b6d1 /test/trefer.c
parent2d5f8835fd9851c65d8e33a9c4bbe5da64d5427e (diff)
downloadhdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.zip
hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.gz
hdf5-4e23c807585ed705173f32e374884a46e4a4f2dd.tar.bz2
[svn-r7181] Purpose:
Version update Description: Removed 1.4 compatibility code in the library. Platforms tested: FreeBSD 4.8 (sleipnir) h5committest
Diffstat (limited to 'test/trefer.c')
-rw-r--r--test/trefer.c30
1 files changed, 0 insertions, 30 deletions
diff --git a/test/trefer.c b/test/trefer.c
index 7a94d62..6183c88 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -162,46 +162,26 @@ test_reference_obj(void)
/* Create reference to dataset */
ret = H5Rcreate(&wbuf[0],fid1,"/Group1/Dataset1",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Rget_object_type(dataset,&wbuf[0]);
- VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[0]);
VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/* Create reference to dataset */
ret = H5Rcreate(&wbuf[1],fid1,"/Group1/Dataset2",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Rget_object_type(dataset,&wbuf[1]);
- VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[1]);
VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/* Create reference to group */
ret = H5Rcreate(&wbuf[2],fid1,"/Group1",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Rget_object_type(dataset,&wbuf[2]);
- VERIFY(ret, H5G_GROUP, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[2]);
VERIFY(ret, H5G_GROUP, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/* Create reference to named datatype */
ret = H5Rcreate(&wbuf[3],fid1,"/Group1/Datatype1",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Rget_object_type(dataset,&wbuf[3]);
- VERIFY(ret, H5G_TYPE, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
ret = H5Rget_obj_type(dataset,H5R_OBJECT,&wbuf[3]);
VERIFY(ret, H5G_TYPE, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/* Write selection to disk */
ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,wbuf);
@@ -326,13 +306,8 @@ test_reference_region(void)
hsize_t block[SPACE2_RANK]; /* Block size of hyperslab */
hssize_t coord1[POINT1_NPOINTS][SPACE2_RANK]; /* Coordinates for point selection */
hsize_t * coords; /* Coordinate buffer */
-#ifdef H5_WANT_H5_V1_4_COMPAT
- hsize_t low[SPACE2_RANK]; /* Selection bounds */
- hsize_t high[SPACE2_RANK]; /* Selection bounds */
-#else /* H5_WANT_H5_V1_4_COMPAT */
hssize_t low[SPACE2_RANK]; /* Selection bounds */
hssize_t high[SPACE2_RANK]; /* Selection bounds */
-#endif /* H5_WANT_H5_V1_4_COMPAT */
hdset_reg_ref_t *wbuf, /* buffer to write to disk */
*rbuf; /* buffer read from disk */
uint8_t *dwbuf, /* Buffer for writing numeric data to disk */
@@ -882,13 +857,8 @@ test_reference_obj_deleted(void)
/* Create reference to dataset */
ret = H5Rcreate(&oref,fid1,"/Dataset1",H5R_OBJECT,-1);
CHECK(ret, FAIL, "H5Rcreate");
-#ifdef H5_WANT_H5_V1_4_COMPAT
- ret = H5Rget_object_type(dataset,&oref);
- VERIFY(ret, H5G_DATASET, "H5Rget_object_type");
-#else /* H5_WANT_H5_V1_4_COMPAT */
ret = H5Rget_obj_type(dataset,H5R_OBJECT,&oref);
VERIFY(ret, H5G_DATASET, "H5Rget_obj_type");
-#endif /* H5_WANT_H5_V1_4_COMPAT */
/* Write selection to disk */
ret=H5Dwrite(dataset,H5T_STD_REF_OBJ,H5S_ALL,H5S_ALL,H5P_DEFAULT,&oref);