Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r48681 - trunk/boost/math/special_functions
From: john_at_[hidden]
Date: 2008-09-09 05:32:55


Author: johnmaddock
Date: 2008-09-09 05:32:54 EDT (Tue, 09 Sep 2008)
New Revision: 48681
URL: http://svn.boost.org/trac/boost/changeset/48681

Log:
Fix for EDG-245 compilers on DECCXX and Tru64.
Text files modified:
   trunk/boost/math/special_functions/expm1.hpp | 4 ++--
   trunk/boost/math/special_functions/log1p.hpp | 4 ++--
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/math/special_functions/expm1.hpp
==============================================================================
--- trunk/boost/math/special_functions/expm1.hpp (original)
+++ trunk/boost/math/special_functions/expm1.hpp 2008-09-09 05:32:54 EDT (Tue, 09 Sep 2008)
@@ -81,7 +81,7 @@
       return x;
    detail::expm1_series<T> s(x);
    boost::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582)) && !BOOST_WORKAROUND(__EDG_VERSION__, <= 245)
    T result = tools::sum_series(s, policies::digits<T, Policy>(), max_iter);
 #else
    T zero = 0;
@@ -232,7 +232,7 @@
 # undef expm1
 #endif
 
-#ifdef BOOST_HAS_EXPM1
+#if defined(BOOST_HAS_EXPM1) && !(defined(__osf__) && defined(__DECCXX_VER))
 # if defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)
 inline float expm1(float x, const policies::policy<>&){ return ::expm1f(x); }
 inline long double expm1(long double x, const policies::policy<>&){ return ::expm1l(x); }

Modified: trunk/boost/math/special_functions/log1p.hpp
==============================================================================
--- trunk/boost/math/special_functions/log1p.hpp (original)
+++ trunk/boost/math/special_functions/log1p.hpp 2008-09-09 05:32:54 EDT (Tue, 09 Sep 2008)
@@ -94,7 +94,7 @@
       return x;
    detail::log1p_series<result_type> s(x);
    boost::uintmax_t max_iter = policies::get_max_series_iterations<Policy>();
-#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582))
+#if !BOOST_WORKAROUND(__BORLANDC__, BOOST_TESTED_AT(0x582)) && !BOOST_WORKAROUND(__EDG_VERSION__, <= 245)
    result_type result = tools::sum_series(s, policies::digits<result_type, Policy>(), max_iter);
 #else
    result_type zero = 0;
@@ -315,7 +315,7 @@
 # undef log1p
 #endif
 
-#ifdef BOOST_HAS_LOG1P
+#if defined(BOOST_HAS_LOG1P) && !(defined(__osf__) && defined(__DECCXX_VER))
 # if (defined(__STDC_VERSION__) && (__STDC_VERSION__ >= 199901)) \
    || ((defined(linux) || defined(__linux) || defined(__linux__)) && !defined(__SUNPRO_CC)) \
    || (defined(__hpux) && !defined(__hppa))


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk