diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-18 16:10:46 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-10-18 16:10:46 (GMT) |
| commit | b0eb42058c02bff41cacae11880b4fbf174821db (patch) | |
| tree | c389ee389c680cccbd2a5c5f11107b588f4bcfa0 /hl | |
| parent | dcf8866b6af90aa0bf50ebeceda6b0f184a07c17 (diff) | |
| download | hdf5-b0eb42058c02bff41cacae11880b4fbf174821db.zip hdf5-b0eb42058c02bff41cacae11880b4fbf174821db.tar.gz hdf5-b0eb42058c02bff41cacae11880b4fbf174821db.tar.bz2 | |
[svn-r14208] Description:
Make H5Pget_filter_by_id() API versioned and switch internal usage
to H5Pget_filter_by_id2().
Add simple regression test for H5Pget_filter_by_id1().
Tested on:
FreeBSD/32 6.2 (duty) in debug mode
FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'hl')
| -rw-r--r-- | hl/test/test_packet.c | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/hl/test/test_packet.c b/hl/test/test_packet.c index 0e025e0..7b594ca 100644 --- a/hl/test/test_packet.c +++ b/hl/test/test_packet.c @@ -829,13 +829,8 @@ test_compress(void) plist_id = H5Dget_create_plist(dset_id); if( plist_id < 0) TEST_ERROR; -#ifdef H5_WANT_H5_V1_6_COMPAT - err = H5Pget_filter_by_id(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, - filter_vals, 0, NULL); -#else - err = H5Pget_filter_by_id(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, + err = H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, filter_vals, 0, NULL, NULL); -#endif if( err < 0) TEST_ERROR; /* The compression level should be 8, the value we passed in */ @@ -865,13 +860,8 @@ test_compress(void) if( plist_id < 0) TEST_ERROR; H5E_BEGIN_TRY { -#ifdef H5_WANT_H5_V1_6_COMPAT - err = H5Pget_filter_by_id(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, - filter_vals, 0, NULL); -#else - err = H5Pget_filter_by_id(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, + err = H5Pget_filter_by_id2(plist_id, H5Z_FILTER_DEFLATE, NULL, &num_elems, filter_vals, 0, NULL, NULL); -#endif if( err >= 0) TEST_ERROR; } H5E_END_TRY |