[Boost-commit] svn:boost r85667 - in trunk: boost/math/distributions boost/math/special_functions boost/math/special_functions/detail libs/math/test

Subject: [Boost-commit] svn:boost r85667 - in trunk: boost/math/distributions boost/math/special_functions boost/math/special_functions/detail libs/math/test
From: john_at_[hidden]
Date: 2013-09-14 12:07:45

Author: johnmaddock
Date: 2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)
New Revision: 85667
URL: http://svn.boost.org/trac/boost/changeset/85667

Log:
Fix GCC -Wshadow warnings.

Text files modified: 
   trunk/boost/math/distributions/beta.hpp                        |     2 +-                                      
   trunk/boost/math/distributions/cauchy.hpp                      |     8 ++++----                                
   trunk/boost/math/distributions/exponential.hpp                 |     6 +++---                                  
   trunk/boost/math/distributions/gamma.hpp                       |     6 +++---                                  
   trunk/boost/math/distributions/inverse_chi_squared.hpp         |     2 +-                                      
   trunk/boost/math/distributions/inverse_gamma.hpp               |     6 +++---                                  
   trunk/boost/math/distributions/inverse_gaussian.hpp            |     8 ++++----                                
   trunk/boost/math/distributions/laplace.hpp                     |     4 ++--                                    
   trunk/boost/math/distributions/logistic.hpp                    |     8 ++++----                                
   trunk/boost/math/distributions/lognormal.hpp                   |     8 ++++----                                
   trunk/boost/math/distributions/non_central_t.hpp               |     4 ++--                                    
   trunk/boost/math/distributions/normal.hpp                      |     6 +++---                                  
   trunk/boost/math/distributions/pareto.hpp                      |     6 +++---                                  
   trunk/boost/math/distributions/poisson.hpp                     |     2 +-                                      
   trunk/boost/math/distributions/rayleigh.hpp                    |     6 +++---                                  
   trunk/boost/math/distributions/skew_normal.hpp                 |    10 +++++-----                              
   trunk/boost/math/distributions/students_t.hpp                  |     2 +-                                      
   trunk/boost/math/distributions/triangular.hpp                  |     6 +++---                                  
   trunk/boost/math/distributions/uniform.hpp                     |     6 +++---                                  
   trunk/boost/math/distributions/weibull.hpp                     |     6 +++---                                  
   trunk/boost/math/special_functions/airy.hpp                    |     4 ++--                                    
   trunk/boost/math/special_functions/detail/bessel_jy_series.hpp |     6 +++---                                  
   trunk/boost/math/special_functions/ellint_rj.hpp               |     2 +-                                      
   trunk/libs/math/test/test_ibeta_inv.hpp                        |     7 ++++---                                 
   24 files changed, 66 insertions(+), 65 deletions(-)

Modified: trunk/boost/math/distributions/beta.hpp
==============================================================================
--- trunk/boost/math/distributions/beta.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/beta.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -156,7 +156,7 @@
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      beta_distribution(RealType alpha = 1, RealType beta = 1) : m_alpha(alpha), m_beta(beta)
+      beta_distribution(RealType l_alpha = 1, RealType l_beta = 1) : m_alpha(l_alpha), m_beta(l_beta)
       {
         RealType result;
         beta_detail::check_dist(

Modified: trunk/boost/math/distributions/cauchy.hpp
==============================================================================
--- trunk/boost/math/distributions/cauchy.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/cauchy.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -152,13 +152,13 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   cauchy_distribution(RealType location = 0, RealType scale = 1)
-      : m_a(location), m_hg(scale)
+   cauchy_distribution(RealType l_location = 0, RealType l_scale = 1)
+      : m_a(l_location), m_hg(l_scale)
    {
     static const char* function = "boost::math::cauchy_distribution<%1%>::cauchy_distribution";
      RealType result;
-     detail::check_location(function, location, &result, Policy());
-     detail::check_scale(function, scale, &result, Policy());
+     detail::check_location(function, l_location, &result, Policy());
+     detail::check_scale(function, l_scale, &result, Policy());
    } // cauchy_distribution
 
    RealType location()const

Modified: trunk/boost/math/distributions/exponential.hpp
==============================================================================
--- trunk/boost/math/distributions/exponential.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/exponential.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -63,11 +63,11 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   exponential_distribution(RealType lambda = 1)
-      : m_lambda(lambda)
+   exponential_distribution(RealType l_lambda = 1)
+      : m_lambda(l_lambda)
    {
       RealType err;
-      detail::verify_lambda("boost::math::exponential_distribution<%1%>::exponential_distribution", lambda, &err, Policy());
+      detail::verify_lambda("boost::math::exponential_distribution<%1%>::exponential_distribution", l_lambda, &err, Policy());
    } // exponential_distribution
 
    RealType lambda()const { return m_lambda; }

Modified: trunk/boost/math/distributions/gamma.hpp
==============================================================================
--- trunk/boost/math/distributions/gamma.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/gamma.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -73,11 +73,11 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   gamma_distribution(RealType shape, RealType scale = 1)
-      : m_shape(shape), m_scale(scale)
+   gamma_distribution(RealType l_shape, RealType l_scale = 1)
+      : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
-      detail::check_gamma("boost::math::gamma_distribution<%1%>::gamma_distribution", scale, shape, &result, Policy());
+      detail::check_gamma("boost::math::gamma_distribution<%1%>::gamma_distribution", l_scale, l_shape, &result, Policy());
    }
 
    RealType shape()const

Modified: trunk/boost/math/distributions/inverse_chi_squared.hpp
==============================================================================
--- trunk/boost/math/distributions/inverse_chi_squared.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/inverse_chi_squared.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -51,7 +51,7 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   inverse_chi_squared_distribution(RealType df, RealType scale) : m_df(df), m_scale (scale)
+   inverse_chi_squared_distribution(RealType df, RealType l_scale) : m_df(df), m_scale (l_scale)
    {
       RealType result;
       detail::check_df(

Modified: trunk/boost/math/distributions/inverse_gamma.hpp
==============================================================================
--- trunk/boost/math/distributions/inverse_gamma.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/inverse_gamma.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -91,13 +91,13 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   inverse_gamma_distribution(RealType shape = 1, RealType scale = 1)
-      : m_shape(shape), m_scale(scale)
+   inverse_gamma_distribution(RealType l_shape = 1, RealType l_scale = 1)
+      : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
       detail::check_inverse_gamma(
         "boost::math::inverse_gamma_distribution<%1%>::inverse_gamma_distribution",
-        scale, shape, &result, Policy());
+        l_scale, l_shape, &result, Policy());
    }
 
    RealType shape()const

Modified: trunk/boost/math/distributions/inverse_gaussian.hpp
==============================================================================
--- trunk/boost/math/distributions/inverse_gaussian.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/inverse_gaussian.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -74,14 +74,14 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   inverse_gaussian_distribution(RealType mean = 1, RealType scale = 1)
-      : m_mean(mean), m_scale(scale)
+   inverse_gaussian_distribution(RealType l_mean = 1, RealType l_scale = 1)
+      : m_mean(l_mean), m_scale(l_scale)
    { // Default is a 1,1 inverse_gaussian distribution.
      static const char* function = "boost::math::inverse_gaussian_distribution<%1%>::inverse_gaussian_distribution";
 
      RealType result;
-     detail::check_scale(function, scale, &result, Policy());
-     detail::check_location(function, mean, &result, Policy());
+     detail::check_scale(function, l_scale, &result, Policy());
+     detail::check_location(function, l_mean, &result, Policy());
    }
 
    RealType mean()const

Modified: trunk/boost/math/distributions/laplace.hpp
==============================================================================
--- trunk/boost/math/distributions/laplace.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/laplace.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -37,8 +37,8 @@
    // ----------------------------------
    // Constructor(s)
    // ----------------------------------
-   laplace_distribution(RealType location = 0, RealType scale = 1)
-      : m_location(location), m_scale(scale)
+   laplace_distribution(RealType l_location = 0, RealType l_scale = 1)
+      : m_location(l_location), m_scale(l_scale)
    {
       RealType result;
       check_parameters("boost::math::laplace_distribution<%1%>::laplace_distribution()", &result);

Modified: trunk/boost/math/distributions/logistic.hpp
==============================================================================
--- trunk/boost/math/distributions/logistic.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/logistic.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -24,14 +24,14 @@
       typedef RealType value_type;
       typedef Policy policy_type;
       
-      logistic_distribution(RealType location=0, RealType scale=1) // Constructor.
-        : m_location(location), m_scale(scale) 
+      logistic_distribution(RealType l_location=0, RealType l_scale=1) // Constructor.
+        : m_location(l_location), m_scale(l_scale) 
       {
         static const char* function = "boost::math::logistic_distribution<%1%>::logistic_distribution";
         
         RealType result;
-        detail::check_scale(function, scale, &result, Policy());
-        detail::check_location(function, location, &result, Policy());
+        detail::check_scale(function, l_scale, &result, Policy());
+        detail::check_location(function, l_location, &result, Policy());
       }
       // Accessor functions.
       RealType scale()const

Modified: trunk/boost/math/distributions/lognormal.hpp
==============================================================================
--- trunk/boost/math/distributions/lognormal.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/lognormal.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -48,12 +48,12 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   lognormal_distribution(RealType location = 0, RealType scale = 1)
-      : m_location(location), m_scale(scale)
+   lognormal_distribution(RealType l_location = 0, RealType l_scale = 1)
+      : m_location(l_location), m_scale(l_scale)
    {
       RealType result;
-      detail::check_scale("boost::math::lognormal_distribution<%1%>::lognormal_distribution", scale, &result, Policy());
-      detail::check_location("boost::math::lognormal_distribution<%1%>::lognormal_distribution", location, &result, Policy());
+      detail::check_scale("boost::math::lognormal_distribution<%1%>::lognormal_distribution", l_scale, &result, Policy());
+      detail::check_location("boost::math::lognormal_distribution<%1%>::lognormal_distribution", l_location, &result, Policy());
    }
 
    RealType location()const

Modified: trunk/boost/math/distributions/non_central_t.hpp
==============================================================================
--- trunk/boost/math/distributions/non_central_t.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/non_central_t.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -449,8 +449,8 @@
             BOOST_MATH_STD_USING
             if ((boost::math::isinf)(n))
             { // Infinite degrees of freedom, so use normal distribution located at delta.
-               normal_distribution<T, Policy> n(delta, 1); 
-               return pdf(n, t);
+               normal_distribution<T, Policy> norm(delta, 1); 
+               return pdf(norm, t);
             }
             //
             // Otherwise, for t < 0 we have to use the reflection formula:

Modified: trunk/boost/math/distributions/normal.hpp
==============================================================================
--- trunk/boost/math/distributions/normal.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/normal.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -31,14 +31,14 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   normal_distribution(RealType mean = 0, RealType sd = 1)
-      : m_mean(mean), m_sd(sd)
+   normal_distribution(RealType l_mean = 0, RealType sd = 1)
+      : m_mean(l_mean), m_sd(sd)
    { // Default is a 'standard' normal distribution N01.
      static const char* function = "boost::math::normal_distribution<%1%>::normal_distribution";
 
      RealType result;
      detail::check_scale(function, sd, &result, Policy());
-     detail::check_location(function, mean, &result, Policy());
+     detail::check_location(function, l_mean, &result, Policy());
    }
 
    RealType mean()const

Modified: trunk/boost/math/distributions/pareto.hpp
==============================================================================
--- trunk/boost/math/distributions/pareto.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/pareto.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -136,11 +136,11 @@
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      pareto_distribution(RealType scale = 1, RealType shape = 1)
-        : m_scale(scale), m_shape(shape)
+      pareto_distribution(RealType l_scale = 1, RealType l_shape = 1)
+        : m_scale(l_scale), m_shape(l_shape)
       { // Constructor.
         RealType result = 0;
-        detail::check_pareto("boost::math::pareto_distribution<%1%>::pareto_distribution", scale, shape, &result, Policy());
+        detail::check_pareto("boost::math::pareto_distribution<%1%>::pareto_distribution", l_scale, l_shape, &result, Policy());
       }
 
       RealType scale()const

Modified: trunk/boost/math/distributions/poisson.hpp
==============================================================================
--- trunk/boost/math/distributions/poisson.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/poisson.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -209,7 +209,7 @@
       typedef RealType value_type;
       typedef Policy policy_type;
 
-      poisson_distribution(RealType mean = 1) : m_l(mean) // mean (lambda).
+      poisson_distribution(RealType l_mean = 1) : m_l(l_mean) // mean (lambda).
       { // Expected mean number of events that occur during the given interval.
         RealType r;
         poisson_detail::check_dist(

Modified: trunk/boost/math/distributions/rayleigh.hpp
==============================================================================
--- trunk/boost/math/distributions/rayleigh.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/rayleigh.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -59,11 +59,11 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   rayleigh_distribution(RealType sigma = 1)
-      : m_sigma(sigma)
+   rayleigh_distribution(RealType l_sigma = 1)
+      : m_sigma(l_sigma)
    {
       RealType err;
-      detail::verify_sigma("boost::math::rayleigh_distribution<%1%>::rayleigh_distribution", sigma, &err, Policy());
+      detail::verify_sigma("boost::math::rayleigh_distribution<%1%>::rayleigh_distribution", l_sigma, &err, Policy());
    } // rayleigh_distribution
 
    RealType sigma()const

Modified: trunk/boost/math/distributions/skew_normal.hpp
==============================================================================
--- trunk/boost/math/distributions/skew_normal.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/skew_normal.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -58,15 +58,15 @@
     typedef RealType value_type;
     typedef Policy policy_type;
 
-    skew_normal_distribution(RealType location = 0, RealType scale = 1, RealType shape = 0)
-      : location_(location), scale_(scale), shape_(shape)
+    skew_normal_distribution(RealType l_location = 0, RealType l_scale = 1, RealType l_shape = 0)
+      : location_(l_location), scale_(l_scale), shape_(l_shape)
     { // Default is a 'standard' normal distribution N01. (shape=0 results in the normal distribution with no skew)
       static const char* function = "boost::math::skew_normal_distribution<%1%>::skew_normal_distribution";
 
       RealType result;
-      detail::check_scale(function, scale, &result, Policy());
-      detail::check_location(function, location, &result, Policy());
-      detail::check_skew_normal_shape(function, shape, &result, Policy());
+      detail::check_scale(function, l_scale, &result, Policy());
+      detail::check_location(function, l_location, &result, Policy());
+      detail::check_skew_normal_shape(function, l_shape, &result, Policy());
     }
 
     RealType location()const

Modified: trunk/boost/math/distributions/students_t.hpp
==============================================================================
--- trunk/boost/math/distributions/students_t.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/students_t.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -96,7 +96,7 @@
    if ((boost::math::isinf)(x))
    { // +infinity.
      normal_distribution<RealType, Policy> n(0, 1); 
-     RealType result = pdf(n, x);
+     result = pdf(n, x);
      return result;
    }
    RealType limit = policies::get_epsilon<RealType, Policy>();

Modified: trunk/boost/math/distributions/triangular.hpp
==============================================================================
--- trunk/boost/math/distributions/triangular.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/triangular.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -147,14 +147,14 @@
     typedef RealType value_type;
     typedef Policy policy_type;
 
-    triangular_distribution(RealType lower = -1, RealType mode = 0, RealType upper = 1)
-      : m_lower(lower), m_mode(mode), m_upper(upper) // Constructor.
+    triangular_distribution(RealType l_lower = -1, RealType l_mode = 0, RealType l_upper = 1)
+      : m_lower(l_lower), m_mode(l_mode), m_upper(l_upper) // Constructor.
     { // Evans says 'standard triangular' is lower 0, mode 1/2, upper 1,
       // has median sqrt(c/2) for c <=1/2 and 1 - sqrt(1-c)/2 for c >= 1/2
       // But this -1, 0, 1 is more useful in most applications to approximate normal distribution,
       // where the central value is the most likely and deviations either side equally likely.
       RealType result;
-      detail::check_triangular("boost::math::triangular_distribution<%1%>::triangular_distribution",lower, mode, upper, &result, Policy());
+      detail::check_triangular("boost::math::triangular_distribution<%1%>::triangular_distribution",l_lower, l_mode, l_upper, &result, Policy());
     }
     // Accessor functions.
     RealType lower()const

Modified: trunk/boost/math/distributions/uniform.hpp
==============================================================================
--- trunk/boost/math/distributions/uniform.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/uniform.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -116,11 +116,11 @@
     typedef RealType value_type;
     typedef Policy policy_type;
 
-    uniform_distribution(RealType lower = 0, RealType upper = 1) // Constructor.
-      : m_lower(lower), m_upper(upper) // Default is standard uniform distribution.
+    uniform_distribution(RealType l_lower = 0, RealType l_upper = 1) // Constructor.
+      : m_lower(l_lower), m_upper(l_upper) // Default is standard uniform distribution.
     {
       RealType result;
-      detail::check_uniform("boost::math::uniform_distribution<%1%>::uniform_distribution", lower, upper, &result, Policy());
+      detail::check_uniform("boost::math::uniform_distribution<%1%>::uniform_distribution", l_lower, l_upper, &result, Policy());
     }
     // Accessor functions.
     RealType lower()const

Modified: trunk/boost/math/distributions/weibull.hpp
==============================================================================
--- trunk/boost/math/distributions/weibull.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/distributions/weibull.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -73,11 +73,11 @@
    typedef RealType value_type;
    typedef Policy policy_type;
 
-   weibull_distribution(RealType shape, RealType scale = 1)
-      : m_shape(shape), m_scale(scale)
+   weibull_distribution(RealType l_shape, RealType l_scale = 1)
+      : m_shape(l_shape), m_scale(l_scale)
    {
       RealType result;
-      detail::check_weibull("boost::math::weibull_distribution<%1%>::weibull_distribution", scale, shape, &result, Policy());
+      detail::check_weibull("boost::math::weibull_distribution<%1%>::weibull_distribution", l_scale, l_shape, &result, Policy());
    }
 
    RealType shape()const

Modified: trunk/boost/math/special_functions/airy.hpp
==============================================================================
--- trunk/boost/math/special_functions/airy.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/special_functions/airy.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -337,7 +337,7 @@
 }
 
 template <class T, class Policy>
-inline T airy_ai_zero(unsigned m, const Policy& pol)
+inline T airy_ai_zero(unsigned m, const Policy& /*pol*/)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename policies::evaluation<T, Policy>::type value_type;
@@ -385,7 +385,7 @@
 }
 
 template <class T, class Policy>
-inline T airy_bi_zero(unsigned m, const Policy& pol)
+inline T airy_bi_zero(unsigned m, const Policy& /*pol*/)
 {
    BOOST_FPU_EXCEPTION_GUARD
    typedef typename policies::evaluation<T, Policy>::type value_type;

Modified: trunk/boost/math/special_functions/detail/bessel_jy_series.hpp
==============================================================================
--- trunk/boost/math/special_functions/detail/bessel_jy_series.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/special_functions/detail/bessel_jy_series.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -194,9 +194,9 @@
    }
    else
    {
-      int s;
-      prefix = boost::math::lgamma(-v, &s, pol) + p;
-      prefix = exp(prefix) * s / constants::pi<T>();
+      int sgn;
+      prefix = boost::math::lgamma(-v, &sgn, pol) + p;
+      prefix = exp(prefix) * sgn / constants::pi<T>();
    }
    bessel_y_small_z_series_term_b<T, Policy> s2(v, x);
    max_iter = policies::get_max_series_iterations<Policy>();

Modified: trunk/boost/math/special_functions/ellint_rj.hpp
==============================================================================
--- trunk/boost/math/special_functions/ellint_rj.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/boost/math/special_functions/ellint_rj.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -91,7 +91,7 @@
 
        BOOST_ASSERT(pmy >= 0);
 
-       T p = pmy + y;
+       p = pmy + y;
        value = boost::math::ellint_rj(x, y, z, p, pol);
        value *= pmy;
        value -= 3 * boost::math::ellint_rf(x, y, z, pol);

Modified: trunk/libs/math/test/test_ibeta_inv.hpp
==============================================================================
--- trunk/libs/math/test/test_ibeta_inv.hpp	Sat Sep 14 10:22:45 2013	(r85666)
+++ trunk/libs/math/test/test_ibeta_inv.hpp	2013-09-14 12:07:45 EDT (Sat, 14 Sep 2013)	(r85667)
@@ -149,6 +149,7 @@
 template <class T>
 void test_spots(T)
 {
+   BOOST_MATH_STD_USING
    //
    // basic sanity checks, tolerance is 100 epsilon expressed as a percentage:
    //
@@ -187,19 +188,19 @@
       ::boost::math::ibeta_inv(
          static_cast<T>(40),
          static_cast<T>(0.5),
-         1 - ldexp(T(1), -30)),
+         static_cast<T>(1 - ldexp(T(1), -30))),
       static_cast<T>(0.99999999999999999998286262026583217516676792408012252456039L), tolerance);
    BOOST_CHECK_CLOSE(
       ::boost::math::ibeta_inv(
          static_cast<T>(0.5),
          static_cast<T>(40),
-         ldexp(T(1), -30)),
+         static_cast<T>(ldexp(T(1), -30))),
       static_cast<T>(1.713737973416782483323207591987747543960774485649459249e-20L), tolerance);
    BOOST_CHECK_CLOSE(
       ::boost::math::ibeta_inv(
          static_cast<T>(0.5),
          static_cast<T>(0.75),
-         ldexp(T(1), -30)),
+         static_cast<T>(ldexp(T(1), -30))),
       static_cast<T>(1.245132488513853853809715434621955746959615015005382639e-18L), tolerance);
    BOOST_CHECK_CLOSE(
       ::boost::math::ibeta_inv(