summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2015-03-26 02:25:32 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2015-03-26 02:25:32 (GMT)
commit27dd4e0f05c72c9ec3745965d525cc4637fc2e0a (patch)
treec06d56a41195c4711155f1f668163b9b9cd21200 /src
parentb03d04742d4d169ed851b3cd154c42a1c075da1e (diff)
downloadhdf5-27dd4e0f05c72c9ec3745965d525cc4637fc2e0a.zip
hdf5-27dd4e0f05c72c9ec3745965d525cc4637fc2e0a.tar.gz
hdf5-27dd4e0f05c72c9ec3745965d525cc4637fc2e0a.tar.bz2
[svn-r26597] Description:
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 branch for 2+ days)
Diffstat (limited to 'src')
-rw-r--r--src/H5Ztrans.c16
-rw-r--r--src/H5config.h.in3
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