diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 20:28:03 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 20:28:03 (GMT) |
commit | 0ea42d66677ffac366aec707fa448793ac5be6b6 (patch) | |
tree | 19ee80047c6c7faf56c53bf64cd53ef45ace173a /config | |
parent | fa367e4f582bcb06c9d58c79b805402cb455ddd7 (diff) | |
download | hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.zip hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.tar.gz hdf5-0ea42d66677ffac366aec707fa448793ac5be6b6.tar.bz2 |
[svn-r26624] Description:
Bring r26584 from trunk to 1.8 branch:
Bring r26485 from the autotools_rework branch to the trunk:
Remove the ULONG_TO_FLOAT_ACCURATE macro/define, we no longer support the
Sandia system where it was necessary.
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 | 9 | ||||
-rw-r--r-- | config/cmake/ConversionTests.c | 32 | ||||
-rw-r--r-- | config/cmake/H5pubconf.h.in | 4 |
3 files changed, 0 insertions, 45 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index eaf2431..74fbd28 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -260,15 +260,6 @@ ENDMACRO (H5MiscConversionTest) # ---------------------------------------------------------------------- # Set the flag to indicate that the machine can accurately convert -# 'unsigned long' to 'float' values. -# (This flag should be set for all machines, except for Pathscale compiler -# on Sandia's Linux machine where the compiler interprets 'unsigned long' -# values as negative when the first bit of 'unsigned long' is on during -# the conversion to float.) -# -H5ConversionTests (H5_ULONG_TO_FLOAT_ACCURATE "Checking IF accurately converting unsigned long to float values") -# ---------------------------------------------------------------------- -# Set the flag to indicate that the machine can accurately convert # 'unsigned (long) long' values to 'float' and 'double' values. # (This flag should be set for all machines, except for the SGIs) and Solaris # 64-bit machines, where the short program below tests if round-up is diff --git a/config/cmake/ConversionTests.c b/config/cmake/ConversionTests.c index 7238af0..e157909 100644 --- a/config/cmake/ConversionTests.c +++ b/config/cmake/ConversionTests.c @@ -410,38 +410,6 @@ done: #endif -#ifdef H5_ULONG_TO_FLOAT_ACCURATE_TEST - -int main(void) -{ - int ret = 0; - unsigned long l1; - unsigned long l2; - unsigned long l3; - float f1; - float f2; - float f3; - - - if(sizeof(unsigned long)==8) { - l1 = 0xffffffffffffffffUL; - l2 = 0xffffffffffff0000UL; - l3 = 0xf000000000000000UL; - - f1 = (float)l1; - f2 = (float)l2; - f3 = (float)l3; - - if((f1 < 0) || (f2 < 0) || (f3 < 0)) - ret = 1; - } - -done: - exit(ret); -} - -#endif - #ifdef H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE_TEST #include <string.h> diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index f0d7590..4b955be 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -669,10 +669,6 @@ correct precision. */ #cmakedefine H5_ULLONG_TO_LDOUBLE_PRECISION @H5_ULLONG_TO_LDOUBLE_PRECISION@ -/* Define if your system accurately converting unsigned long to float values. - */ -#cmakedefine H5_ULONG_TO_FLOAT_ACCURATE @H5_ULONG_TO_FLOAT_ACCURATE@ - /* Define if your system can accurately convert unsigned (long) long values to floating-point values. */ #cmakedefine H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE @H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE@ |