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 /config | |
| 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 'config')
| -rw-r--r-- | config/cmake/ConfigureChecks.cmake | 6 | ||||
| -rw-r--r-- | config/cmake/ConversionTests.c | 16 | ||||
| -rw-r--r-- | config/cmake/H5pubconf.h.in | 4 |
3 files changed, 0 insertions, 26 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index fad780c..7978c27 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -259,12 +259,6 @@ ENDMACRO (H5MiscConversionTest) #----------------------------------------------------------------------------- # ---------------------------------------------------------------------- -# Set the flag to indicate that the machine can accurately convert -# 'long double' to 'unsigned int' values. (This flag should be set for -# all machines, except for some Intel compilers on some Linux.) -# -H5ConversionTests (H5_LDOUBLE_TO_UINT_ACCURATE "Checking IF correctly converting long double to unsigned int values") -# ---------------------------------------------------------------------- # Set the flag to indicate that the machine can _compile_ # 'unsigned long long' to 'float' and 'double' typecasts. # (This flag should be set for all machines.) diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c index 3b9b416..3003ef2 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c @@ -170,22 +170,6 @@ done: } #endif -#ifdef H5_LDOUBLE_TO_UINT_ACCURATE_TEST -int main(void) -{ - long double ld = 2733248032.9183987530L; - unsigned int i; - int ret = 0; - - i = (unsigned int)ld; - if(i!=2733248032 && i!=2733248031 && i!=2733248033) - ret = 1; - -done: - exit(ret); -} -#endif - #ifdef H5_LLONG_TO_LDOUBLE_CORRECT_TEST int main(void) { diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index b698731..b27e688 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -449,10 +449,6 @@ special algorithm. */ #cmakedefine H5_LDOUBLE_TO_LONG_SPECIAL @H5_LDOUBLE_TO_LONG_SPECIAL@ -/* Define if your system can convert long double to unsigned int values - correctly. */ -#cmakedefine H5_LDOUBLE_TO_UINT_ACCURATE @H5_LDOUBLE_TO_UINT_ACCURATE@ - /* Define if your system can compile long long to floating-point casts. */ #cmakedefine H5_LLONG_TO_FP_CAST_WORKS @H5_LLONG_TO_FP_CAST_WORKS@ |