summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeil Fortner <nfortne2@hdfgroup.org>2009-04-20 19:32:47 (GMT)
committerNeil Fortner <nfortne2@hdfgroup.org>2009-04-20 19:32:47 (GMT)
commit5237d6680aa7756f37e868dc9643e214afdf3511 (patch)
tree4a23a36a72f07939f81d5bd6535b532a8874f1c8
parent58976422500779b530468a488e6b011c985e8374 (diff)
downloadhdf5-5237d6680aa7756f37e868dc9643e214afdf3511.zip
hdf5-5237d6680aa7756f37e868dc9643e214afdf3511.tar.gz
hdf5-5237d6680aa7756f37e868dc9643e214afdf3511.tar.bz2
[svn-r16809] Purpose: Add version macro
Description: Versioning was just added to H5Z_class_t in 1.8. Therefore, I am adding a H5Z_class1_t macro to 1.6 to enable backwards compatibility using H5Z_class1_t. Tested: jam (simple change)
-rw-r--r--release_docs/RELEASE.txt5
-rw-r--r--src/H5Zpublic.h6
-rw-r--r--test/dsets.c9
3 files changed, 19 insertions, 1 deletions
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index e9bafa4..0ca4429 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -87,6 +87,8 @@ Bug Fixes since HDF5-1.6.8 Release
Library
-------
+ - Added H5Z_class1_t macro, as H5Z_class_t is now versioned in 1.8.
+ NAF - 2009/04/20 - 1533
- Fixed a bug that prevented more than one dataset chunk from being cached
at a time. NAF - 2009/02/12
- H5Dset_extent: when shrinking dimensions, some chunks were not deleted.
@@ -300,6 +302,9 @@ Footnotes:
Known Problems
==============
+* h5repack may not handle committed datatypes correctly. NAF - 2009/4/20 - 1516/
+ 1466
+
* When in production mode, any presence of the '-g' flag within CFLAGS is
stripped out during configuration. This currently cannot be overridden.
In order to build with '-g' specified within CFLAGS, use the
diff --git a/src/H5Zpublic.h b/src/H5Zpublic.h
index accd763..379bc3c 100644
--- a/src/H5Zpublic.h
+++ b/src/H5Zpublic.h
@@ -74,6 +74,12 @@ typedef int H5Z_filter_t;
#define H5Z_SZIP_PARM_BPP 2 /* "Local" parameter for bits-per-pixel */
#define H5Z_SZIP_PARM_PPS 3 /* "Local" parameter for pixels-per-scanline */
+/*
+ * API compatibility macros - for backward compatibility of programs that
+ * explicitly use the 1.6 API functions (H5Gcreate1, etc.)
+ */
+#define H5Z_class1_t H5Z_class_t
+
/* Values to decide if EDC is enabled for reading data */
diff --git a/test/dsets.c b/test/dsets.c
index 5445e23..2623a58 100644
--- a/test/dsets.c
+++ b/test/dsets.c
@@ -4130,7 +4130,7 @@ static herr_t
test_compat(hid_t file)
{
hid_t dataset, space, dcpl;
- H5Z_filter_t filtn;
+ H5Z_class1_t filter_class;
herr_t status;
TESTING("version compatibility macros");
@@ -4159,6 +4159,13 @@ test_compat(hid_t file)
if (H5Pget_filter1(dcpl, 0, NULL, NULL, NULL, 0, NULL) < 0) goto error;
if (H5Pget_filter_by_id1(dcpl, H5Z_FILTER_SHUFFLE, NULL, NULL, NULL, 0, NULL) < 0) goto error;
+ /* Try setting a few fields in H5Z_class1_t */
+ filter_class.id = 365;
+ filter_class.name = "fake_filter";
+ filter_class.can_apply = NULL;
+ filter_class.set_local = NULL;
+ filter_class.filter = NULL;
+
/* Close */
if (H5Pclose(dcpl) < 0) goto error;
if (H5Dclose(dataset) < 0) goto error;