diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-19 22:22:06 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-19 22:22:06 (GMT) |
commit | 9fb399b3d2c071f273279be81317be53a084d073 (patch) | |
tree | 96f4e61cdff17cb22379248617f040a8e7dfa77e /config/cmake | |
parent | 5329a7d6f1e4323636489f896621be0c3167486f (diff) | |
download | hdf5-9fb399b3d2c071f273279be81317be53a084d073.zip hdf5-9fb399b3d2c071f273279be81317be53a084d073.tar.gz hdf5-9fb399b3d2c071f273279be81317be53a084d073.tar.bz2 |
[svn-r26495] Description:
Bring r26258 from the autotools_rework branch to the trunk - remove
the LDOUBLE_TO_INTEGER_WORKS macro/define, which was addressing issues with
SGI systems that are no longer supported.
Tested on:
Linux 2.6.x (jam) w/serial & parallel
Daily tested on branch for >2 weeks
Diffstat (limited to 'config/cmake')
-rw-r--r-- | config/cmake/ConfigureChecks.cmake | 9 | ||||
-rw-r--r-- | config/cmake/ConversionTests.c | 29 | ||||
-rw-r--r-- | config/cmake/H5pubconf.h.in | 3 |
3 files changed, 0 insertions, 41 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 939ee57..4dff2c2 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -259,15 +259,6 @@ ENDMACRO (H5MiscConversionTest) #----------------------------------------------------------------------------- # ----------------------------------------------------------------------- -# Set flag to indicate that the machine can do conversion from -# long double to integers regardless of accuracy. This flag should be -# set "yes" for all machines except HP-UX 11.00. For HP-UX 11.00, the -# compiler has 'floating exception' when converting 'long double' to all -# integers except 'unsigned long long'. Other HP-UX systems are unknown -# yet. (1/8/05 - SLU) -# -H5ConversionTests (H5_LDOUBLE_TO_INTEGER_WORKS "Checking IF converting from long double to integers works") -# ----------------------------------------------------------------------- # Set flag to indicate that the machine can handle conversion from # integers to long double. (This flag should be set "yes" for all # machines except all SGIs, where some conversions are diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c index 010ee32..7238af0 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c @@ -61,35 +61,6 @@ done: #endif -#ifdef H5_LDOUBLE_TO_INTEGER_WORKS_TEST - -#include <stdlib.h> -#include <string.h> - -int main(void) -{ - void *align; - long double ld= 9701917572145405952.00L; - unsigned char v1; - short v2; - unsigned int v3; - int ret = 0; - - align = (void*)malloc(sizeof(long double)); - memcpy(align, &ld, sizeof(long double)); - - /*For HU-UX11.00, there's floating exception(core dump) when doing some of casting - *from 'long double' to integers*/ - v1=(unsigned char)(*((long double*)align)); - v2=(short)(*((long double*)align)); - v3=(unsigned int)(*((long double*)align)); - -done: - exit(ret); -} - -#endif - #ifdef H5_LDOUBLE_TO_LONG_SPECIAL_TEST int main(void) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index 201b661..c13b420 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -460,9 +460,6 @@ values. */ #cmakedefine H5_INTEGER_TO_LDOUBLE_ACCURATE @H5_INTEGER_TO_LDOUBLE_ACCURATE@ -/* Define if your system can convert from long double to integer values. */ -#cmakedefine H5_LDOUBLE_TO_INTEGER_WORKS @H5_LDOUBLE_TO_INTEGER_WORKS@ - /* Define if your system can convert long double to (unsigned) long long values correctly. */ #cmakedefine H5_LDOUBLE_TO_LLONG_ACCURATE @H5_LDOUBLE_TO_LLONG_ACCURATE@ |