[svn-r10658] Purpose:

Bug fix

Description:
The intel compiler on windows doesn't support long long to double conversion.

Solution:
Added a flag  H5_LLONG_TO_FP_CAST_WORKS.  When it is not defined, the data transform will issue
an error when someone tries to perform a transform from long long to double and the long long to double
dtransform test will be skipped.

Platforms tested:
heping, sol, copper

Misc. update:

2 files changed, 44 insertions, 35 deletions

diff --git a/src/H5Ztrans.c b/src/H5Ztrans.c
index 2f97414..8858b63 100644
--- a/src/H5Ztrans.c
+++ b/src/H5Ztrans.c
@@ -141,39 +141,25 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
 										\
 }
 
-#ifdef H5_ULLONG_TO_FP_CAST_WORKS
-#define H5Z_XFORM_TYPE_OP(RESL,RESR,TYPE,OP,SIZE)			\
-{									\
-    if((TYPE) == H5T_NATIVE_CHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), char, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SCHAR)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), signed char, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_SHORT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), short, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_USHORT)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned short, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_INT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), int, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_UINT)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned int, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_ULONG)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long, OP, (SIZE))	\
-    else if((TYPE) == H5T_NATIVE_LLONG)					\
-	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)					\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_DOUBLE)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), double, OP, (SIZE))		\
-    else if((TYPE) == H5T_NATIVE_LDOUBLE)				\
-	H5Z_XFORM_DO_OP1((RESL), (RESR), long double, OP, (SIZE))	\
-}
+/* Due to the undefined nature of embedding macros/conditionals within macros, we employ
+ * this clever little hack.  We always compile in the code for the type conversion, even if
+ * it isn't supported in the compiler.  To avoid errors, we define  ULLONG_TO_FP_XFORM_TYPE_OP_ERROR on
+ * unsupported compilers, which will cause the code to execute HGOTO_ERROR and skip the code
+ * that does the actual conversion */
+
+
+#ifndef H5_ULLONG_TO_FP_CAST_WORKS
+#define   ULLONG_TO_FP_XFORM_TYPE_OP_ERROR	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot convert from unsigned long long to double: required for data transform") 
 #else
+#define ULLONG_TO_FP_XFORM_TYPE_OP_ERROR  
+#endif
+
+#ifndef H5_LLONG_TO_FP_CAST_WORKS
+#define   LLONG_TO_FP_XFORM_TYPE_OP_ERROR	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "Cannot convert from long long to double: required for data transform") 
+#else
+#define LLONG_TO_FP_XFORM_TYPE_OP_ERROR
+#endif
+
 #define H5Z_XFORM_TYPE_OP(RESL,RESR,TYPE,OP,SIZE)			\
 {									\
     if((TYPE) == H5T_NATIVE_CHAR)					\
@@ -195,10 +181,15 @@ 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)					\
+    {									\
+	LLONG_TO_FP_XFORM_TYPE_OP_ERROR					\
 	H5Z_XFORM_DO_OP1((RESL), (RESR), long_long, OP, (SIZE))		\
+    }									\
     else if((TYPE) == H5T_NATIVE_ULLONG)				\
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL,                       \
-	    "Cannot convert from unsigned long long to double: required for data transform") \
+    {									\
+	 ULLONG_TO_FP_XFORM_TYPE_OP_ERROR				\
+         H5Z_XFORM_DO_OP1((RESL), (RESR), unsigned long_long, OP, (SIZE)) \
+    }									\
     else if((TYPE) == H5T_NATIVE_FLOAT)					\
 	H5Z_XFORM_DO_OP1((RESL), (RESR), float, OP, (SIZE))		\
     else if((TYPE) == H5T_NATIVE_DOUBLE)				\
@@ -206,7 +197,6 @@ static void H5Z_print(H5Z_node *tree, FILE *stream);
     else if((TYPE) == H5T_NATIVE_LDOUBLE)				\
 	H5Z_XFORM_DO_OP1((RESL), (RESR), long double, OP, (SIZE))	\
 }
-#endif
 
 #define H5Z_XFORM_DO_OP3(OP)                                                                                                                    \
 {                                                                                                                                               \
diff --git a/test/dtransform.c b/test/dtransform.c
index 6dc5eb2..8e77590 100644
--- a/test/dtransform.c
+++ b/test/dtransform.c
@@ -246,9 +246,19 @@ int main(void)
     TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned int, H5T_NATIVE_UINT, "uint", transformData, 0);
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
     TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
+
+#ifdef H5_LLONG_TO_FP_CAST_WORKS
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+#else
+    TESTING("contiguous, with type conversion (float->llong)")
+    SKIPPED()
+#endif
+
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS   
     TEST_TYPE_CONTIG(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+#else
+    TESTING("contiguous, with type conversion (float->ullong)")
+    SKIPPED()
 #endif
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1);
     TEST_TYPE_CONTIG(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1);
@@ -263,9 +273,18 @@ int main(void)
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned int, H5T_NATIVE_UINT, "uint", transformData, 0);
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, long, H5T_NATIVE_LONG, "long", windchillFfloat, 1);
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long, H5T_NATIVE_ULONG, "ulong", transformData, 0);
+#ifdef H5_LLONG_TO_FP_CAST_WORKS
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, long_long, H5T_NATIVE_LLONG, "llong", windchillFfloat, 1);
+#else
+    TESTING("chunked, with type conversion (float->llong)")
+    SKIPPED()
+#endif
+
 #ifdef H5_ULLONG_TO_FP_CAST_WORKS   
     TEST_TYPE_CHUNK(dxpl_id_utrans_inv, unsigned long_long, H5T_NATIVE_ULLONG, "ullong", transformData, 0);
+#else
+    TESTING("chunked, with type conversion (float->ullong)")
+    SKIPPED()
 #endif
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, float, H5T_NATIVE_FLOAT, "float", windchillFfloat, 1);
     TEST_TYPE_CHUNK(dxpl_id_c_to_f, double, H5T_NATIVE_DOUBLE, "double", windchillFfloat, 1);