diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 21:37:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2015-03-27 21:37:15 (GMT) |
| commit | fe01716dbc8443764542777d22b1252716293884 (patch) | |
| tree | 578cc7cc31707090778856d2033f8bd80d148a85 /test | |
| parent | d4e0d3020ea03f71a3b2c289cacaf6ec5deb4b9a (diff) | |
| download | hdf5-fe01716dbc8443764542777d22b1252716293884.zip hdf5-fe01716dbc8443764542777d22b1252716293884.tar.gz hdf5-fe01716dbc8443764542777d22b1252716293884.tar.bz2 | |
[svn-r26628] Description:
Bring r26591 from trunk to 1.8 branch:
Bring r26492 from autotools_rework branch back to trunk:
Remove the FP_TO_ULLONG_ACCURATE and FP_TO_ULLONG_RIGHT_MAXIMUM
macros/defines, which were added to address problems with older PGI
compilers and HP-UX systems and are no longer supported.
Tested on:
Linux/32 2.6.18 (jam) w/serial & parallel)
(Daily tested for 2+ days on trunk)
Diffstat (limited to 'test')
| -rw-r--r-- | test/dt_arith.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/test/dt_arith.c b/test/dt_arith.c index b90169f..110c996 100644 --- a/test/dt_arith.c +++ b/test/dt_arith.c @@ -5297,26 +5297,8 @@ run_fp_int_conv(const char *name) nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_FLOAT, H5T_NATIVE_LLONG); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_DOUBLE, H5T_NATIVE_LLONG); } -#ifdef H5_FP_TO_ULLONG_RIGHT_MAXIMUM nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_FLOAT, H5T_NATIVE_ULLONG); nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_DOUBLE, H5T_NATIVE_ULLONG); -#else /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM*/ - { - char str[256]; /*hello string */ - - HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", - name, "float", "unsigned long long"); - printf("%-70s", str); - SKIPPED(); - HDputs(" Test skipped due to hardware conversion error."); - - HDsnprintf(str, sizeof(str), "Testing %s %s -> %s conversions", - name, "double", "unsigned long long"); - printf("%-70s", str); - SKIPPED(); - HDputs(" Test skipped due to hardware conversion error."); - } -#endif /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM*/ #endif #if H5_SIZEOF_LONG_DOUBLE!=H5_SIZEOF_DOUBLE @@ -5381,9 +5363,9 @@ run_fp_int_conv(const char *name) #endif } #endif /*H5_LDOUBLE_TO_LLONG_ACCURATE*/ -#if defined(H5_FP_TO_ULLONG_RIGHT_MAXIMUM) && defined(H5_LDOUBLE_TO_LLONG_ACCURATE) +#if defined(H5_LDOUBLE_TO_LLONG_ACCURATE) nerrors += test_conv_int_fp(name, test_values, H5T_NATIVE_LDOUBLE, H5T_NATIVE_ULLONG); -#else /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM && H5_LDOUBLE_TO_LLONG_ACCURATE*/ +#else /*H5_LDOUBLE_TO_LLONG_ACCURATE*/ { char str[256]; /*string */ @@ -5397,7 +5379,7 @@ run_fp_int_conv(const char *name) HDputs(" Test skipped due to disabled long double."); #endif } -#endif /*H5_FP_TO_ULLONG_RIGHT_MAXIMUM && H5_LDOUBLE_TO_LLONG_ACCURATE*/ +#endif /*H5_LDOUBLE_TO_LLONG_ACCURATE*/ #endif #endif #ifndef H5_VMS |