[Boost-commit] svn:boost r81546 - trunk/boost/math/special_functions/detail

Subject: [Boost-commit] svn:boost r81546 - trunk/boost/math/special_functions/detail
From: john_at_[hidden]
Date: 2012-11-26 05:23:19

Author: johnmaddock
Date: 2012-11-26 05:23:17 EST (Mon, 26 Nov 2012)
New Revision: 81546
URL: http://svn.boost.org/trac/boost/changeset/81546

Log:
Don't pass potential expression templates to make_tuple as it confuses gcc-4.4.x.
Text files modified: 
   trunk/boost/math/special_functions/detail/erf_inv.hpp        |     2 +-                                      
   trunk/boost/math/special_functions/detail/ibeta_inverse.hpp  |     4 ++--                                    
   trunk/boost/math/special_functions/detail/igamma_inverse.hpp |     2 +-                                      
   3 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/math/special_functions/detail/erf_inv.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/erf_inv.hpp	(original)
+++ trunk/boost/math/special_functions/detail/erf_inv.hpp	2012-11-26 05:23:17 EST (Mon, 26 Nov 2012)
@@ -282,7 +282,7 @@
       BOOST_MATH_STD_USING
       T derivative = sign * (2 / sqrt(constants::pi<T>())) * exp(-(guess * guess));
       T derivative2 = -2 * guess * derivative;
-      return boost::math::make_tuple(((sign > 0) ? boost::math::erf(guess, Policy()) : boost::math::erfc(guess, Policy())) - target, derivative, derivative2);
+      return boost::math::make_tuple(((sign > 0) ? boost::math::erf(guess, Policy()) : static_cast<T>(boost::math::erfc(guess, Policy())) - target), derivative, derivative2);
    }
    erf_roots(T z, int s) : target(z), sign(s) {}
 private:

Modified: trunk/boost/math/special_functions/detail/ibeta_inverse.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/ibeta_inverse.hpp	(original)
+++ trunk/boost/math/special_functions/detail/ibeta_inverse.hpp	2012-11-26 05:23:17 EST (Mon, 26 Nov 2012)
@@ -35,12 +35,12 @@
       if(y == 0)
       {
          T big = tools::max_value<T>() / 4;
-         return boost::math::make_tuple(-big, -big);
+         return boost::math::make_tuple(static_cast<T>(-big), static_cast<T>(-big));
       }
       if(x == 0)
       {
          T big = tools::max_value<T>() / 4;
-         return boost::math::make_tuple(-big, big);
+         return boost::math::make_tuple(static_cast<T>(-big), big);
       }
       T f = log(x) + a * log(y) + t;
       T f1 = (1 / x) - (a / (y));

Modified: trunk/boost/math/special_functions/detail/igamma_inverse.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/igamma_inverse.hpp	(original)
+++ trunk/boost/math/special_functions/detail/igamma_inverse.hpp	2012-11-26 05:23:17 EST (Mon, 26 Nov 2012)
@@ -378,7 +378,7 @@
          f2 = -f2;
       }
 
-      return boost::math::make_tuple(f - p, f1, f2);
+      return boost::math::make_tuple(static_cast<T>(f - p), f1, f2);
    }
 private:
    T a, p;