diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2003-07-07 19:02:46 (GMT) |
| commit | 4e23c807585ed705173f32e374884a46e4a4f2dd (patch) | |
| tree | df458773252f84a19720b4d8b3588db955f4b6d1 /c++/test | |
| parent | 2d5f8835fd9851c65d8e33a9c4bbe5da64d5427e (diff) | |
| download | hdf5-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 'c++/test')
| -rw-r--r-- | c++/test/dsets.cpp | 4 | ||||
| -rw-r--r-- | c++/test/tfile.cpp | 12 |
2 files changed, 0 insertions, 16 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index b92381a..0d58cd0 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -648,11 +648,7 @@ test_compression(H5File& file) */ TESTING("compression (app-defined method)"); -#ifdef H5_WANT_H5_V1_4_COMPAT - if (H5Zregister (H5Z_FILTER_BOGUS, "bogus", bogus)<0) goto error; -#else /* H5_WANT_H5_V1_4_COMPAT */ if (H5Zregister (H5Z_BOGUS)<0) goto error; -#endif /* H5_WANT_H5_V1_4_COMPAT */ if (H5Pset_filter (dscreatplist.getId(), H5Z_FILTER_BOGUS, 0, 0, NULL)<0) goto error; dscreatplist.setFilter (H5Z_FILTER_BOGUS, 0, 0, NULL); diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 82d7338..37cc5e1 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -153,11 +153,7 @@ test_file_create(void) VERIFY(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -207,11 +203,7 @@ test_file_create(void) VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1->getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -294,11 +286,7 @@ test_file_open(void) VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); int iparm1; /*file-creation parameters */ -#ifdef H5_WANT_H5_V1_4_COMPAT - int iparm2; /*file-creation parameters */ -#else /* H5_WANT_H5_V1_4_COMPAT */ unsigned iparm2; /*file-creation parameters */ -#endif /* H5_WANT_H5_V1_4_COMPAT */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); |