diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-01 04:36:17 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-01 04:36:17 (GMT) |
| commit | 59aa015d9f796d5cfc6c94073efb7741d9601970 (patch) | |
| tree | c242978356043f892d5ef2021ec65726acb94387 /src/H5Tconv.c | |
| parent | 3b5a4a064871fdf9a0fcabafc27c491fc1f56a2f (diff) | |
| parent | a90e09889d575b26648f642d3bc85639df165dc9 (diff) | |
| download | hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.zip hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.tar.gz hdf5-59aa015d9f796d5cfc6c94073efb7741d9601970.tar.bz2 | |
[svn-r27638] Merged r27500-27631 from trunk.
Diffstat (limited to 'src/H5Tconv.c')
| -rw-r--r-- | src/H5Tconv.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index b14f6e5..6847e68 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -4255,7 +4255,11 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") goto padding; -#ifndef H5_VMS /*Temporary solution to handle VAX special values*/ + /* Temporary solution to handle VAX special values. + * Note that even though we don't support VAX anymore, we + * still need to handle legacy VAX files so this code must + * remain in place. + */ } else if (H5T__bit_find (s, src.u.f.epos, src.u.f.esize, H5T_BIT_LSB, FALSE)<0) { /* NaN */ @@ -4280,7 +4284,6 @@ H5T__conv_f_f(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, HGOTO_ERROR(H5E_DATATYPE, H5E_CANTCONVERT, FAIL, "can't handle conversion exception") goto padding; -#endif /*H5_VMS*/ } /* |