diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 22:12:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 22:12:22 (GMT) |
| commit | 46f59e4fd4309862727dc72409476fdb76239961 (patch) | |
| tree | 0ca5b5de357e9f632ee7a8fed9c31a761208b0dd /src/H5Tconv.c | |
| parent | fe01716dbc8443764542777d22b1252716293884 (diff) | |
| download | hdf5-46f59e4fd4309862727dc72409476fdb76239961.zip hdf5-46f59e4fd4309862727dc72409476fdb76239961.tar.gz hdf5-46f59e4fd4309862727dc72409476fdb76239961.tar.bz2 | |
[svn-r26630] Description:
Bring r26595 from trunk to 1.8 branch:
Bring r26494 from autotools_rework branch back to trunk:
Remove the LDOUBLE_TO_UINT_ACCURATE macro/define, it was addressing
problems with older Intel compilers on Linux that are no longer supported.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(Daily tested on trunk for 2+ days)
Diffstat (limited to 'src/H5Tconv.c')
| -rw-r--r-- | src/H5Tconv.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 463fa9b..d84d546 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -8472,7 +8472,6 @@ H5_GCC_DIAG_ON(float-equal) * *------------------------------------------------------------------------- */ -#if H5T_CONV_INTERNAL_LDOUBLE_UINT herr_t H5T__conv_ldouble_uint (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8483,7 +8482,6 @@ H5_GCC_DIAG_OFF(float-equal) H5T_CONV_Fx(LDOUBLE, UINT, long double, unsigned int, 0, UINT_MAX); H5_GCC_DIAG_ON(float-equal) } -#endif /* H5T_CONV_INTERNAL_LDOUBLE_UINT */ /*------------------------------------------------------------------------- |