summaryrefslogtreecommitdiffstats
path: root/config/cmake
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-03-25 22:11:19 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-03-25 22:11:19 (GMT)
commitc622cc7b38791567a6e41d147121a76a20837e96 (patch)
treee6e93907418d53802e35bcb0d1ae1d3c1cd39b71 /config/cmake
parent451a91e53bdc0f930c2acf382d14a5e2fd9cb2d9 (diff)
downloadhdf5-c622cc7b38791567a6e41d147121a76a20837e96.zip
hdf5-c622cc7b38791567a6e41d147121a76a20837e96.tar.gz
hdf5-c622cc7b38791567a6e41d147121a76a20837e96.tar.bz2
[svn-r26595] Description:
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 branch for several days)
Diffstat (limited to 'config/cmake')
-rw-r--r--config/cmake/ConfigureChecks.cmake6
-rw-r--r--config/cmake/ConversionTests.c16
-rw-r--r--config/cmake/H5pubconf.h.in4
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 63eb23f..95fd856 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@