summaryrefslogtreecommitdiffstats
path: root/src/H5Tconv.c
diff options
context:
space:
mode:
authorMohamad Chaarawi <chaarawi@hdfgroup.org>2015-08-28 20:57:41 (GMT)
committerMohamad Chaarawi <chaarawi@hdfgroup.org>2015-08-28 20:57:41 (GMT)
commita31524e4aee50324ccbc6707584b1758279f984e (patch)
treebffd22d55739fd897b06ec9d3c9339fc1f1bd7c3 /src/H5Tconv.c
parent0286bb12de563c6aeb1b9d0c5be4afe717305477 (diff)
parent1847391fc51728811407f3e1586213758c1d0e89 (diff)
downloadhdf5-a31524e4aee50324ccbc6707584b1758279f984e.zip
hdf5-a31524e4aee50324ccbc6707584b1758279f984e.tar.gz
hdf5-a31524e4aee50324ccbc6707584b1758279f984e.tar.bz2
[svn-r27607] merge from trunk.
Diffstat (limited to 'src/H5Tconv.c')
-rw-r--r--src/H5Tconv.c7
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*/
}
/*