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 /src/H5Tpkg.h | |
| 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 'src/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index 39791e0..fcc351f 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -177,18 +177,11 @@ #define H5T_CONV_INTERNAL_ULLONG_LDOUBLE 1 #endif -/* 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_WORKS) || \ - (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) -#define H5T_CONV_INTERNAL_LDOUBLE_INTEGER 1 -#endif - /* 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_UINT_ACCURATE && \ - H5_LDOUBLE_TO_INTEGER_WORKS) || (!H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_INTEGER_WORKS) +#if (H5_WANT_DATA_ACCURACY && H5_LDOUBLE_TO_UINT_ACCURATE) \ + || (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_LDOUBLE_UINT 1 #endif @@ -202,8 +195,8 @@ * 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_WORKS && defined(H5_LDOUBLE_TO_LLONG_ACCURATE)) || \ - (!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)) #define H5T_CONV_INTERNAL_LDOUBLE_LLONG 1 #endif @@ -220,9 +213,9 @@ /* 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_WORKS && \ +#if (H5_WANT_DATA_ACCURACY && \ 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) + (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 1 #else #define H5T_CONV_INTERNAL_LDOUBLE_ULLONG 0 |