diff options
| author | Dana Robinson <derobins@hdfgroup.org> | 2015-09-09 22:27:54 (GMT) |
|---|---|---|
| committer | Dana Robinson <derobins@hdfgroup.org> | 2015-09-09 22:27:54 (GMT) |
| commit | cd3d499e7324ce7757bae41158878a460041bc3f (patch) | |
| tree | 187a144523aa665548d58523b6cf452e32211962 /test | |
| parent | f88a20544b777706fe8f84e24c924de0d97f0f6c (diff) | |
| download | hdf5-cd3d499e7324ce7757bae41158878a460041bc3f.zip hdf5-cd3d499e7324ce7757bae41158878a460041bc3f.tar.gz hdf5-cd3d499e7324ce7757bae41158878a460041bc3f.tar.bz2 | |
[svn-r27730] Merge r26618 from trunk
Remove the FP_TO_INTEGER_OVERFLOW_WORKS macro/define, which is for working
around bugs in the Cray X1 compiler and is no longer supported.
Tested on: h5committest
Diffstat (limited to 'test')
| -rw-r--r-- | test/dt_arith.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c index 23d9958..4e87192 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -5077,7 +5077,6 @@ static int run_fp_int_conv(const char *name) { int nerrors = 0; -#ifdef H5_FP_TO_INTEGER_OVERFLOW_WORKS int test_values; for(test_values = TEST_NORMAL; test_values <= TEST_SPECIAL; test_values++) { @@ -5190,23 +5189,6 @@ run_fp_int_conv(const char *name) #endif #endif } /* end for */ -#else /* H5_FP_TO_INTEGER_OVERFLOW_WORKS */ -/* For Cray X1, the compiler generates floating exception when the - * conversion overflows. So disable all of the conversions from - * floating-point numbers to integers. - */ - char str[256]; /*string */ - - HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", - name, "all floating-point numbers", "all integers"); - printf("%-70s", str); - SKIPPED(); -#if H5_SIZEOF_LONG_DOUBLE!=0 - HDputs(" Test skipped due to hardware conversion error."); -#else - HDputs(" Test skipped due to disbaled long double."); -#endif -#endif /* H5_FP_TO_INTEGER_OVERFLOW_WORKS */ return nerrors; } |