summaryrefslogtreecommitdiffstats
path: root/src/H5Tconv.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-06 02:05:27 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-06 02:05:27 (GMT)
commit67678e9a3f081a5d7e29b654a14b899f4ab50a9b (patch)
tree4b80130895965ed708bdcc5e1d3803ad05cf95a2 /src/H5Tconv.c
parent2b35b265e91dea7157347aa0a631cc35bcabf6c9 (diff)
downloadhdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.zip
hdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.tar.gz
hdf5-67678e9a3f081a5d7e29b654a14b899f4ab50a9b.tar.bz2
[svn-r27685] Merge of r27572 from trunk
Remove all VMS-specific code from the library. The exception is the VMS floating-point tests since those are special as VMS floats are odd. Those files will be considered separately. Fixes HDFFV-9495 Tested on: h5committest
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 a66ec0c..e87b1ff 100644
--- a/src/H5Tconv.c
+++ b/src/H5Tconv.c
@@ -4220,7 +4220,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 */
@@ -4245,7 +4249,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*/
}
/*