From b6a34fb182be882f2f494a86cd23d0e732d656e7 Mon Sep 17 00:00:00 2001 From: Dana Robinson Date: Wed, 9 Sep 2015 22:47:01 -0500 Subject: [svn-r27737] Merge of r26627 from trunk Remove the WANT_DATA_ACCURACY macro/define/configure option, since it's no longer attached to any library behavior. Tested on: jam (has baked in the trunk for over 6 months) --- config/cmake/ConfigureChecks.cmake | 12 ------------ config/cmake/H5pubconf.h.in | 3 --- configure | 32 +------------------------------- configure.ac | 21 --------------------- release_docs/RELEASE.txt | 7 +++++++ src/H5config.h.in | 3 --- 6 files changed, 8 insertions(+), 70 deletions(-) diff --git a/config/cmake/ConfigureChecks.cmake b/config/cmake/ConfigureChecks.cmake index 38dd50f..9583eef 100644 --- a/config/cmake/ConfigureChecks.cmake +++ b/config/cmake/ConfigureChecks.cmake @@ -33,18 +33,6 @@ endif (HDF5_METADATA_TRACE_FILE) MARK_AS_ADVANCED (HDF5_METADATA_TRACE_FILE) # ---------------------------------------------------------------------- -# Decide whether the data accuracy has higher priority during data -# conversions. If not, some hard conversions will still be prefered even -# though the data may be wrong (for example, some compilers don't -# support denormalized floating values) to maximize speed. -# -option (HDF5_WANT_DATA_ACCURACY "IF data accuracy is guaranteed during data conversions" ON) -if (HDF5_WANT_DATA_ACCURACY) - set (H5_WANT_DATA_ACCURACY 1) -endif (HDF5_WANT_DATA_ACCURACY) -MARK_AS_ADVANCED (HDF5_WANT_DATA_ACCURACY) - -# ---------------------------------------------------------------------- # Decide whether the presence of user's exception handling functions is # checked and data conversion exceptions are returned. This is mainly # for the speed optimization of hard conversions. Soft conversions can diff --git a/config/cmake/H5pubconf.h.in b/config/cmake/H5pubconf.h.in index e1eb57e..cbfe775 100644 --- a/config/cmake/H5pubconf.h.in +++ b/config/cmake/H5pubconf.h.in @@ -582,9 +582,6 @@ /* Version number of package */ #define H5_VERSION "@HDF5_PACKAGE_VERSION_STRING@" -/* Data accuracy is prefered to speed during data conversions */ -#cmakedefine H5_WANT_DATA_ACCURACY @H5_WANT_DATA_ACCURACY@ - /* Check exception handling functions during data conversions */ #cmakedefine H5_WANT_DCONV_EXCEPTION @H5_WANT_DCONV_EXCEPTION@ diff --git a/configure b/configure index e44509f..1406d51 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.ac Id: configure.ac 27730 2015-09-09 22:27:54Z derobins . +# From configure.ac Id: configure.ac 27736 2015-09-10 03:23:40Z derobins . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.69 for HDF5 1.8.16-snap16. # @@ -911,7 +911,6 @@ with_mpe enable_direct_vfd with_default_plugindir enable_dconv_exception -enable_dconv_accuracy enable_build_all enable_deprecated_symbols with_default_api_version @@ -1606,8 +1605,6 @@ Optional Features: --enable-dconv-exception if exception handling functions is checked during data conversions [default=yes] - --enable-dconv-accuracy if data accuracy is guaranteed during data - conversions [default=yes] --enable-build-all Build helper programs that only developers should need [default=no] --enable-deprecated-symbols @@ -27252,33 +27249,6 @@ $as_echo "no" >&6; } fi ## ---------------------------------------------------------------------- -## Decide whether the data accuracy has higher priority during data -## conversions. If not, some hard conversions will still be prefered even -## though the data may be wrong (for example, some compilers don't -## support denormalized floating values) to maximize speed. -## -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether data accuracy is guaranteed during data conversions" >&5 -$as_echo_n "checking whether data accuracy is guaranteed during data conversions... " >&6; } -# Check whether --enable-dconv-accuracy was given. -if test "${enable_dconv_accuracy+set}" = set; then : - enableval=$enable_dconv_accuracy; DATA_ACCURACY=$enableval -else - DATA_ACCURACY=yes -fi - - -if test "$DATA_ACCURACY" = "yes"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define WANT_DATA_ACCURACY 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - -## ---------------------------------------------------------------------- ## Set the flag to indicate that the machine can handle converting ## floating-point to long long values. ## (This flag should be _unset_ for all machines, except for Windows, where diff --git a/configure.ac b/configure.ac index 101882b..ab57d76 100644 --- a/configure.ac +++ b/configure.ac @@ -2216,27 +2216,6 @@ else fi ## ---------------------------------------------------------------------- -## Decide whether the data accuracy has higher priority during data -## conversions. If not, some hard conversions will still be prefered even -## though the data may be wrong (for example, some compilers don't -## support denormalized floating values) to maximize speed. -## -AC_MSG_CHECKING([whether data accuracy is guaranteed during data conversions]) -AC_ARG_ENABLE([dconv-accuracy], - [AS_HELP_STRING([--enable-dconv-accuracy], - [if data accuracy is guaranteed during - data conversions [default=yes]])], - [DATA_ACCURACY=$enableval], [DATA_ACCURACY=yes]) - -if test "$DATA_ACCURACY" = "yes"; then - AC_MSG_RESULT([yes]) - AC_DEFINE([WANT_DATA_ACCURACY], [1], - [Data accuracy is prefered to speed during data conversions]) -else - AC_MSG_RESULT([no]) -fi - -## ---------------------------------------------------------------------- ## Set the flag to indicate that the machine can handle converting ## floating-point to long long values. ## (This flag should be _unset_ for all machines, except for Windows, where diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt index 6ad90e5..81b792d 100644 --- a/release_docs/RELEASE.txt +++ b/release_docs/RELEASE.txt @@ -143,6 +143,13 @@ New Features (DER - 2015/09/09 HDFFV-9188) + - Removed WANT_DATA_ACCURACY symbol and associated code from the + library. + + This is no longer attached to any supported platforms. + + (DER - 2015/09/09 HDFFV-9194) + Library ------- diff --git a/src/H5config.h.in b/src/H5config.h.in index 4d82835..bbc9e3a 100644 --- a/src/H5config.h.in +++ b/src/H5config.h.in @@ -551,9 +551,6 @@ /* Version number of package */ #undef VERSION -/* Data accuracy is prefered to speed during data conversions */ -#undef WANT_DATA_ACCURACY - /* Check exception handling functions during data conversions */ #undef WANT_DCONV_EXCEPTION -- cgit v0.12