diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-25 19:56:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-25 19:56:23 (GMT) |
| commit | a877ab37b641f4bb3e63322b67805eb128626771 (patch) | |
| tree | d83e5f81550f78bbafc998b436d7e3f34a3e12cb /src/H5Tpkg.h | |
| parent | 5966f8ce26f03a57de337d1f4e853c0af1a7828c (diff) | |
| download | hdf5-a877ab37b641f4bb3e63322b67805eb128626771.zip hdf5-a877ab37b641f4bb3e63322b67805eb128626771.tar.gz hdf5-a877ab37b641f4bb3e63322b67805eb128626771.tar.bz2 | |
[svn-r26588] Description:
Bring r26560 from trunk 1.8 branch:
Bring r26483 from autotools_rework branch back to trunk:
Remove INTEGER_TO_LDOUBLE_ACCURATE macro/define - we no longer support
SGI systems.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel
(daily tested for 2+ days)
Diffstat (limited to 'src/H5Tpkg.h')
| -rw-r--r-- | src/H5Tpkg.h | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/H5Tpkg.h b/src/H5Tpkg.h index fcc351f..3b56ac4 100644 --- a/src/H5Tpkg.h +++ b/src/H5Tpkg.h @@ -124,12 +124,6 @@ #define H5T_CONV_INTERNAL_FP_LDOUBLE 1 #endif /*H5_SIZEOF_LONG_DOUBLE && H5_CONVERT_DENORMAL_FLOAT*/ -/* Define an internal macro for converting all integers to long double. SGI compilers give some - * incorrect conversions. */ -#if (H5_WANT_DATA_ACCURACY && H5_INTEGER_TO_LDOUBLE_ACCURATE) || (!H5_WANT_DATA_ACCURACY) -#define H5T_CONV_INTERNAL_INTEGER_LDOUBLE 1 -#endif - /* Define an internal macro for converting unsigned long to float. * Pathscale compiler on Sandia's Linux machine has some problem. * 64-bit Solaris does different rounding. */ @@ -146,14 +140,14 @@ /* Define an internal macro for converting unsigned long to long double. SGI compilers give some * incorrect conversions. 64-bit Solaris does different rounding. */ -#if (H5_WANT_DATA_ACCURACY && H5_INTEGER_TO_LDOUBLE_ACCURATE && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ +#if (H5_WANT_DATA_ACCURACY && H5_ULONG_TO_FP_BOTTOM_BIT_ACCURATE) || \ (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_ULONG_LDOUBLE 1 #endif /* Define an internal macro for converting long long to long double. Mac OS 10.4 gives some * incorrect conversions. */ -#if (H5_WANT_DATA_ACCURACY && H5_INTEGER_TO_LDOUBLE_ACCURATE && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || \ +#if (H5_WANT_DATA_ACCURACY && defined(H5_LLONG_TO_LDOUBLE_CORRECT)) || \ (!H5_WANT_DATA_ACCURACY) #define H5T_CONV_INTERNAL_LLONG_LDOUBLE 1 #endif |