diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-02-20 19:19:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-02-20 19:19:15 (GMT) |
| commit | 707965be8a3152fa8bbbbef81083e4c967586d7d (patch) | |
| tree | 731a55af74ca070930980f51072a0534f739f758 /src | |
| parent | 9d993c5b76e0427c248b1d0186fe7b710a8d0c24 (diff) | |
| download | hdf5-707965be8a3152fa8bbbbef81083e4c967586d7d.zip hdf5-707965be8a3152fa8bbbbef81083e4c967586d7d.tar.gz hdf5-707965be8a3152fa8bbbbef81083e4c967586d7d.tar.bz2 | |
[svn-r26257] Description:
Remove the LDOUBLE_TO_INTEGER_ACCURATE macro, since it was added to work
around non-standard behavior on SGI IRIX, which we are no longer supporting.
Tested on:
Mac OSX/64 10.10.2 (amazon) w/serial
(h5committest not required on this branch)
Diffstat (limited to 'src')
| -rw-r--r-- | src/H5Tpkg.h | 8 |
1 files changed, 4 insertions, 4 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 |