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/H5Tpkg.h | |
| 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/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index ad0f6a3..71ede65 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -172,21 +172,10 @@ #define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1 #endif -/* Define an internal macro for converting floating numbers to unsigned long long. PGI compiler does - * roundup when the source fraction part is greater than 0.5. HP-UX compilers set the maximal number - * for unsigned long long as 0x7fffffffffffffff during conversion. */ -#if (H5_WANT_DATA_ACCURACY && H5_FP_TO_ULLONG_ACCURATE && defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM)) || \ - (!H5_WANT_DATA_ACCURACY) -#define H5T_CONV_INTERNAL_FP_ULLONG 1 -#else -#define H5T_CONV_INTERNAL_FP_ULLONG 0 -#endif - /* Define an internal macro for converting long double to unsigned long long. SGI compilers give some * incorrect conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates * floating exception. */ -#if (H5_WANT_DATA_ACCURACY && \ - H5_FP_TO_ULLONG_ACCURATE && defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM) && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \ +#if (H5_WANT_DATA_ACCURACY && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \ (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 1 #else |