[svn-r24074] I took out the soft conversion functions H5T__conv_i_f and H5T__conv_f_i for OpenVMS because

they have problem to convert between integers and floating numbers.  I also commented out the test
case in dt_arith.c for OpenVMS.  

Tested on jam - simple change.

2 files changed, 20 insertions, 1 deletions

diff --git a/src/H5T.c b/src/H5T.c
index 3b4719c..c39b532 100644
--- a/src/H5T.c
+++ b/src/H5T.c
@@ -1050,9 +1050,12 @@ H5T_init_interface(void)
     status = 0;
 
     status |= H5T_register(H5T_PERS_SOFT, "i_i", fixedpt, fixedpt, H5T__conv_i_i, H5AC_dxpl_id, FALSE);
-    status |= H5T_register(H5T_PERS_SOFT, "i_f", fixedpt, floatpt, H5T__conv_i_f, H5AC_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "f_f", floatpt, floatpt, H5T__conv_f_f, H5AC_dxpl_id, FALSE);
+#ifndef H5_VMS
+    /* Disable these two conversion function because OpenVMS has trouble with them - SLU 2013/8/26 */
+    status |= H5T_register(H5T_PERS_SOFT, "i_f", fixedpt, floatpt, H5T__conv_i_f, H5AC_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "f_i", floatpt, fixedpt, H5T__conv_f_i, H5AC_dxpl_id, FALSE);
+#endif
     status |= H5T_register(H5T_PERS_SOFT, "s_s", string, string, H5T__conv_s_s, H5AC_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "b_b", bitfield, bitfield, H5T__conv_b_b, H5AC_dxpl_id, FALSE);
     status |= H5T_register(H5T_PERS_SOFT, "ibo", fixedpt, fixedpt, H5T__conv_order, H5AC_dxpl_id, FALSE);
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 3f115cc..e4512df 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -632,6 +632,11 @@ test_hard_query(void)
         goto error;
     }
 
+
+#ifndef H5_VMS
+    /* Disable this test because the soft conversion functions (H5T__conv_i_f and H5T__conv_f_i) on
+       OpenVMS and are disabled - SLU 2013/8/26 */
+
     /* Unregister the hard conversion from int to float.  Verify the conversion
      * is a soft conversion. */
     H5Tunregister(H5T_PERS_HARD, NULL, H5T_NATIVE_INT, H5T_NATIVE_FLOAT, H5T__conv_int_float);
@@ -640,6 +645,7 @@ test_hard_query(void)
         printf("Can't query conversion function\n");
         goto error;
     }
+#endif
 
     /* Register the hard conversion from int to float.  Verify the conversion
      * is a hard conversion. */
@@ -5433,9 +5439,14 @@ main(void)
     /* Test H5Tcompiler_conv() for querying hard conversion. */
     nerrors += test_hard_query();
 
+#ifndef H5_VMS
+    /* Disable this test because the soft conversion functions (H5T__conv_i_f and H5T__conv_f_i) on
+       OpenVMS and are disabled - SLU 2013/8/26 */
+
     /* Test user-define, query functions and software conversion
      * for user-defined floating-point types */
     nerrors += test_derived_flt();
+#endif
 
     /* Test user-define, query functions and software conversion
      * for user-defined integer types */
@@ -5478,11 +5489,16 @@ main(void)
     nerrors += test_conv_int_2();
     nerrors += run_integer_tests("soft");
 
+#ifndef H5_VMS
+    /* Disable these tests because the soft conversion functions (H5T__conv_i_f and H5T__conv_f_i) on
+       OpenVMS and are disabled - SLU 2013/8/26 */
+
     /* Test software float-integer conversion functions */
     nerrors += run_fp_int_conv("soft");
 
     /* Test software integer-float conversion functions */
     nerrors += run_int_fp_conv("soft");
+#endif
 
     reset_hdf5();