diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 21:37:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 21:37:15 (GMT) |
| commit | fe01716dbc8443764542777d22b1252716293884 (patch) | |
| tree | 578cc7cc31707090778856d2033f8bd80d148a85 /src/H5Tconv.c | |
| parent | d4e0d3020ea03f71a3b2c289cacaf6ec5deb4b9a (diff) | |
| download | hdf5-fe01716dbc8443764542777d22b1252716293884.zip hdf5-fe01716dbc8443764542777d22b1252716293884.tar.gz hdf5-fe01716dbc8443764542777d22b1252716293884.tar.bz2 | |
[svn-r26628] Description:
Bring r26591 from trunk to 1.8 branch:
Bring r26492 from autotools_rework branch back to trunk:
Remove the FP_TO_ULLONG_ACCURATE and FP_TO_ULLONG_RIGHT_MAXIMUM
macros/defines, which were added to address problems with older PGI
compilers and HP-UX systems and are no longer supported.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel)
(Daily tested for 2+ days on trunk)
Diffstat (limited to 'src/H5Tconv.c')
| -rw-r--r-- | src/H5Tconv.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/H5Tconv.c b/src/H5Tconv.c index 0b6b8b3..463fa9b 100644 --- a/src/H5Tconv.c +++ b/src/H5Tconv.c @@ -8692,7 +8692,6 @@ H5_GCC_DIAG_ON(float-equal) * *------------------------------------------------------------------------- */ -#if H5T_CONV_INTERNAL_FP_ULLONG herr_t H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8701,7 +8700,6 @@ H5T__conv_float_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { H5T_CONV_Fx(FLOAT, ULLONG, float, unsigned long long, 0, ULLONG_MAX); } -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ /*------------------------------------------------------------------------- @@ -8748,7 +8746,6 @@ H5_GCC_DIAG_ON(float-equal) * *------------------------------------------------------------------------- */ -#if H5T_CONV_INTERNAL_FP_ULLONG herr_t H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, size_t nelmts, size_t buf_stride, @@ -8757,7 +8754,6 @@ H5T__conv_double_ullong (hid_t src_id, hid_t dst_id, H5T_cdata_t *cdata, { H5T_CONV_Fx(DOUBLE, ULLONG, double, unsigned long long, 0, ULLONG_MAX); } -#endif /*H5T_CONV_INTERNAL_FP_ULLONG*/ /*------------------------------------------------------------------------- |