summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-03-19 21:52:50 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-03-19 21:52:50 (GMT)
commit5329a7d6f1e4323636489f896621be0c3167486f (patch)
tree84c4f94dc6796e98ead2d96dafc52880d5fdf1db /src
parent9501c1685758455fe7ff7f4fdbfbf93bff09a531 (diff)
downloadhdf5-5329a7d6f1e4323636489f896621be0c3167486f.zip
hdf5-5329a7d6f1e4323636489f896621be0c3167486f.tar.gz
hdf5-5329a7d6f1e4323636489f896621be0c3167486f.tar.bz2
[svn-r26491] Description:
Bring r26257 from autotools_rework branch back to the trunk - removes the LDOUBLE_TO_INTEGER_ACCURATE macro/define, which was addressing problems with SGI systems and is no longer supported. Tested on: Linux 2.6.x/32 (jam) w/serial & parallel Daily tested on branch for >2 weeks.
Diffstat (limited to 'src')
-rw-r--r--src/H5Tpkg.h8
-rw-r--r--src/H5config.h.in3
2 files changed, 4 insertions, 7 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h
index bd37829..39791e0 100644
--- a/src/H5Tpkg.h
+++ b/src/H5Tpkg.h
@@ -179,7 +179,7 @@
/* Define an internal macro for converting long double to all integers. SGI compilers give some incorrect
* conversions. HP-UX 11.00 compiler generates floating exception. */
-#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_INTEGER_WORKS) || \
+#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) || \
(!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_INTEGER 1
#endif
@@ -187,7 +187,7 @@
/* Define an internal macro for converting long double to unsigned int. SGI compilers give some incorrect
* conversions. HP-UX 11.00 compiler generates floating exception. Some Intel compilers on some Linux
* give incorrect values. */
-#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_UINT_ACCURATE && \
+#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_UINT_ACCURATE && \
H5_LDOUBLE_TO_INTEGER_WORKS) || (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_UINT 1
#endif
@@ -201,7 +201,7 @@
/* Define an internal macro for converting long double to long long. SGI compilers give some incorrect
* conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates floating exception.
* The hard conversion on Windows .NET 2003 has a bug and gives wrong exception value. */
-#if (H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && H5_LDOUBLE_TO_INTEGER_ACCURATE && \
+#if (H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && \
H5_LDOUBLE_TO_INTEGER_WORKS && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
(!H5_WANT_DATA_ACCURACY && !defined(H5_HW_FP_TO_LLONG_NOT_WORKS) && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1
@@ -220,7 +220,7 @@
/* Define an internal macro for converting long double to unsigned long long. SGI compilers give some
* incorrect conversions. Mac OS 10.4 gives incorrect conversions. HP-UX 11.00 compiler generates
* floating exception. */
-#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_ACCURATE && H5_LDOUBLE_TO_INTEGER_WORKS && \
+#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS && \
H5_FP_TO_ULLONG_ACCURATE && defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM) && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \
(!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS)
#define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 1
diff --git a/src/H5config.h.in b/src/H5config.h.in
index a2fa0ad..d9aef37 100644
--- a/src/H5config.h.in
+++ b/src/H5config.h.in
@@ -386,9 +386,6 @@
values. */
#undef INTEGER_TO_LDOUBLE_ACCURATE
-/* Define if your system can convert long double to integers accurately. */
-#undef LDOUBLE_TO_INTEGER_ACCURATE
-
/* Define if your system can convert from long double to integer values. */
#undef LDOUBLE_TO_INTEGER_WORKS