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 /src | |
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 'src')
-rw-r--r-- | src/H5Ztrans.c | 16 | ||||
-rw-r--r-- | src/H5config.h.in | 3 |
2 files changed, 2 insertions, 17 deletions
diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c index 7d46d70..7a94487 100644 --- a/src/H5Ztrans.c +++ b/src/H5Ztrans.c @@ -160,18 +160,6 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Unexpected type conversion operation") \ } -/* Windows Intel 8.1 compiler has error converting long long to double. - * Hard code it in. - */ -#ifndef H5_LLONG_TO_FP_CAST_WORKS -#define H5Z_XFORM_LL_DO_OP1(RESL,RESR,TYPE,OP,SIZE) \ -{ \ - HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot convert from long long to double: required for data transform") \ -} -#else -#define H5Z_XFORM_LL_DO_OP1(RESL,RESR,TYPE,OP,SIZE) \ - H5Z_XFORM_DO_OP1(RESL,RESR,TYPE,OP,SIZE) -#endif #if H5_SIZEOF_LONG_DOUBLE !=0 #define H5Z_XFORM_TYPE_OP(RESL,RESR,TYPE,OP,SIZE) \ { \ @@ -194,7 +182,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); else if((TYPE) == H5T_NATIVE_ULONG) \ H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_LLONG) \ - H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \ + H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_ULLONG) \ H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_FLOAT) \ @@ -226,7 +214,7 @@ static void H5Z_print(H5Z_node *tree, FILE *stream); else if((TYPE) == H5T_NATIVE_ULONG) \ H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_LLONG) \ - H5Z_XFORM_LL_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \ + H5Z_XFORM_DO_OP1((RESL), (RESR), long long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_ULLONG) \ H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long long, OP, (SIZE)) \ else if((TYPE) == H5T_NATIVE_FLOAT) \ diff --git a/src/H5config.h.in b/src/H5config.h.in index 2ab7837..4baab7e 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -382,9 +382,6 @@ special algorithm. */ #undef LDOUBLE_TO_LONG_SPECIAL -/* Define if your system can compile long long to floating-point casts. */ -#undef LLONG_TO_FP_CAST_WORKS - /* Define if your system can convert (unsigned) long long to long double values correctly. */ #undef LLONG_TO_LDOUBLE_CORRECT |