diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 01:14:40 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-28 01:14:40 (GMT) |
| commit | 87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105 (patch) | |
| tree | ce973d47b7507730bd60ccbe27f01ab7d639572b /config | |
| parent | 03f3e620bbea7dd1474c42150d05817f14d23783 (diff) | |
| download | hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.zip hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.tar.gz hdf5-87db75e2e6f88b3dfdaf1c8758a1dbb2396d9105.tar.bz2 | |
[svn-r26637] Description:
Bring r26597 from trunk to 1.8 branch:
Bring r26500 from autotools_rework branch to trunk:
Remove the LLONG_TO_FP_CAST_WORKS macro/define, as it targets problems with
the Visual Studio 6 compilers.
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/H5pubconf.h.in | 3 |
2 files changed, 0 insertions, 12 deletions
diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 2b68779..e8951c6 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -259,15 +259,6 @@ ENDMACRO (H5MiscConversionTest) #----------------------------------------------------------------------------- # ---------------------------------------------------------------------- -# Set the flag to indicate that the machine can _compile_ -# 'long long' to 'float' and 'double' typecasts. -# (This flag should be set for all machines.) -# -if (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$) - set (H5_LLONG_TO_FP_CAST_WORKS 1 CACHE INTERNAL "Checking IF compiling long long to floating-point typecasts work") - message (STATUS "Checking IF compiling long long to floating-point typecasts work... yes") -endif (H5_LLONG_TO_FP_CAST_WORKS MATCHES ^H5_LLONG_TO_FP_CAST_WORKS$) -# ---------------------------------------------------------------------- # Set the flag to indicate that the machine can convert from # 'unsigned long long' to 'long double' without precision loss. # (This flag should be set for all machines, except for FreeBSD(sleipnir) diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index c4e3c8d..aa96d1c 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -449,9 +449,6 @@ special algorithm. */ #cmakedefine H5_LDOUBLE_TO_LONG_SPECIAL @H5_LDOUBLE_TO_LONG_SPECIAL@ -/* 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@ - /* Define if your system can convert (unsigned) long long to long double values correctly. */ #cmakedefine H5_LLONG_TO_LDOUBLE_CORRECT @H5_LLONG_TO_LDOUBLE_CORRECT@ |