diff options
| author | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-21 16:46:38 (GMT) |
|---|---|---|
| committer | Raymond Lu <songyulu@hdfgroup.org> | 2010-09-21 16:46:38 (GMT) |
| commit | d6c6a34a8f5876d21dee052c74426b0606b62d13 (patch) | |
| tree | 67b0dddc97926eae54a6fd23a563a4e2296dabab /test/enum.c | |
| parent | ba71366f9867bd2d817abf6715a5445237023c6f (diff) | |
| download | hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.zip hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.gz hdf5-d6c6a34a8f5876d21dee052c74426b0606b62d13.tar.bz2 | |
[svn-r19457] Bug fix for 1707 - H5Eset_auto causes a seg fault when an application uses -DH5_USE_16_API with the 1.8 library to compile. The cause is from the mismatch of H5Eprint1 and H5Eprint2 set
through H5Eset_auto. I changed the union in the structure H5E_auto_t. Another change is to
make H5Eget_auto fail if H5Eset_auto is called to set the printing function. I'll write a
document for it.
Tested on heiwa, jam, and amani.
The property change in configure.in, config, and Makefile.am came from the merge of the 1.8
library change.
Diffstat (limited to 'test/enum.c')
| -rw-r--r-- | test/enum.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/test/enum.c b/test/enum.c index c627af1..0033c44 100644 --- a/test/enum.c +++ b/test/enum.c @@ -383,7 +383,11 @@ test_value_dsnt_exist(void) TESTING("for non-existing name and value"); /* Turn off error reporting since we expect failure in this test */ - if (H5Eset_auto2(H5E_DEFAULT, NULL, NULL) < 0) goto error; +#ifdef H5_USE_16_API_DEFAULT + if (H5Eset_auto(NULL, NULL) < 0) goto error; +#else /* H5_USE_16_API_DEFAULT */ + if (H5Eset_auto(H5E_DEFAULT, NULL, NULL) < 0) goto error; +#endif /* H5_USE_16_API_DEFAULT */ if ((datatype_id = H5Tenum_create(H5T_NATIVE_INT))< 0) goto error; |