diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2004-04-28 18:42:25 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2004-04-28 18:42:25 (GMT) |
| commit | d992a4a387d543332c8fcc7e3cdebef5bcc47e7d (patch) | |
| tree | 865d8ea1a9f1685d8fd37e4cf7a8f36da7e7e271 /src | |
| parent | 480e8d4c9cf0d4b399de7564cc15c4b372e90f51 (diff) | |
| download | hdf5-d992a4a387d543332c8fcc7e3cdebef5bcc47e7d.zip hdf5-d992a4a387d543332c8fcc7e3cdebef5bcc47e7d.tar.gz hdf5-d992a4a387d543332c8fcc7e3cdebef5bcc47e7d.tar.bz2 | |
[svn-r8427] Purpose:
Bug fix (sorta)
Description:
Add hack to allow the MS Visual Studio 6 compiler to build the library.
It cannot cast unsigned long long values to float or double values. So, add
another configuration macro to disable this conversion in the library. Just
the "hardware" conversion is disabled, so the library will still correctly
convert unsigned long long to float and double values, it will just happen
more slowly with the "software" conversion routine.
Platforms tested:
FreeBSD 4.9 (sleipnir) with "Windows" setting faked
inappropriate for h5committest
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5T.c | 2 | ||||
| -rw-r--r-- | src/H5Tconv.c | 2 | ||||
| -rw-r--r-- | src/H5Tpkg.h | 2 | ||||
| -rw-r--r-- | src/H5config.h.in | 4 |
4 files changed, 10 insertions, 0 deletions
@@ -1119,9 +1119,11 @@ H5T_init_interface(void) status |= H5T_register(H5T_PERS_HARD, "llong_flt", native_llong, native_float, H5T_conv_llong_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "llong_dbl", native_llong, native_double, H5T_conv_llong_double, H5AC_dxpl_id); +#ifdef H5_ULLONG_TO_FP_CAST_WORKS /* From unsigned long long to floats */ status |= H5T_register(H5T_PERS_HARD, "ullong_flt", native_ullong, native_float, H5T_conv_ullong_float, H5AC_dxpl_id); status |= H5T_register(H5T_PERS_HARD, "ullong_dbl", native_ullong, native_double, H5T_conv_ullong_double, H5AC_dxpl_id); +#endif /* H5_ULLONG_TO_FP_CAST_WORKS */ /* From floats to char */ status |= H5T_register(H5T_PERS_HARD, "flt_char", native_float, native_schar, H5T_conv_float_char, H5AC_dxpl_id); diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 156e359..d0d54df 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -7532,6 +7532,7 @@ done: FUNC_LEAVE_NOAPI(ret_value); } +#ifdef H5_ULLONG_TO_FP_CAST_WORKS /*------------------------------------------------------------------------- * Function: H5T_conv_ullong_float @@ -7595,6 +7596,7 @@ H5T_conv_ullong_double (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, done: FUNC_LEAVE_NOAPI(ret_value); } +#endif /* H5_ULLONG_TO_FP_CAST_WORKS */ /*------------------------------------------------------------------------- diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index d22c733..5828ac9 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -947,6 +947,7 @@ H5_DLL herr_t H5T_conv_llong_double(hid_t src_id, hid_t dst_id, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); +#ifdef H5_ULLONG_TO_FP_CAST_WORKS H5_DLL herr_t H5T_conv_ullong_float(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, @@ -957,6 +958,7 @@ H5_DLL herr_t H5T_conv_ullong_double(hid_t src_id, hid_t dst_id, size_t buf_stride, size_t bkg_stride, void *buf, void *bkg, hid_t dset_xfer_plist); +#endif /* H5_ULLONG_TO_FP_CAST_WORKS */ H5_DLL herr_t H5T_conv_float_char(hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, hsize_t nelmts, size_t buf_stride, size_t bkg_stride, diff --git a/src/H5config.h.in b/src/H5config.h.in index dffdb8a..bcb1cab 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -515,6 +515,10 @@ /* Define to 1 if your <sys/time.h> declares `struct tm'. */ #undef TM_IN_SYS_TIME +/* Define if your system can compile unsigned long long to floating-point + casts. */ +#undef ULLONG_TO_FP_CAST_WORKS + /* Define if the HDF5 v1.6 compatibility functions are to be compiled in */ #undef WANT_H5_V1_6_COMPAT |