summaryrefslogtreecommitdiffstats
path: root/test/dt_arith.c
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2015-09-10 11:11:32 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2015-09-10 11:11:32 (GMT)
commitacbcc04f88d9745215d01542b44ccb4c037ae4ce (patch)
tree6c6032f0345e063231494ffb873d01fe686b484e /test/dt_arith.c
parent982ec313d61fda25b3eb27f2c3193f7ca5201a31 (diff)
downloadhdf5-acbcc04f88d9745215d01542b44ccb4c037ae4ce.zip
hdf5-acbcc04f88d9745215d01542b44ccb4c037ae4ce.tar.gz
hdf5-acbcc04f88d9745215d01542b44ccb4c037ae4ce.tar.bz2
[svn-r27743] Merge of r26625 from the trunk
Remove the LLONG_TO_LDOUBLE_CORRECT macro/define, it's working around bugs in very old SGI/FreeBSD/Windows compilers. Tested on: jam (minor change that has baked in the trunk for months)
Diffstat (limited to 'test/dt_arith.c')
-rw-r--r--test/dt_arith.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c
index 4caebaf..8e8ffba 100644
--- a/test/dt_arith.c
+++ b/test/dt_arith.c
@@ -4930,32 +4930,8 @@ run_int_fp_conv(const char *name)
#endif
#endif /* H5_SIZEOF_LONG!=H5_SIZEOF_INT */
#if H5_SIZEOF_LONG_LONG!=H5_SIZEOF_LONG
-#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_LLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
- {
- char str[256]; /*hello string */
-
- HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions",
- name, "long long", "long double");
- printf("%-70s", str);
- SKIPPED();
- HDputs(" Test skipped due to compiler error in handling conversion.");
- }
-#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */
-#if H5_LLONG_TO_LDOUBLE_CORRECT
nerrors += test_conv_int_fp(name, TEST_NORMAL, H5T_NATIVE_ULLONG, H5T_NATIVE_LDOUBLE);
-#else /* H5_LLONG_TO_LDOUBLE_CORRECT */
- {
- char str[256]; /*hello string */
-
- HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions",
- name, "unsigned long long", "long double");
- printf("%-70s", str);
- SKIPPED();
- HDputs(" Test skipped due to compiler not handling conversion.");
- }
-#endif /* H5_LLONG_TO_LDOUBLE_CORRECT */
#endif
#endif