[Boost-commit] svn:boost r47995 - in trunk/boost/math: distributions special_functions special_functions/detail

From: john_at_[hidden]
Date: 2008-08-06 04:47:32

Author: johnmaddock
Date: 2008-08-06 04:47:31 EDT (Wed, 06 Aug 2008)
New Revision: 47995
URL: http://svn.boost.org/trac/boost/changeset/47995

Log:
Changed some variable names to suppress -Wshadow warnings, also fixes #2167.
Text files modified: 
   trunk/boost/math/distributions/non_central_chi_squared.hpp  |     2 +-                                      
   trunk/boost/math/special_functions/beta.hpp                 |     4 ++--                                    
   trunk/boost/math/special_functions/detail/ibeta_inverse.hpp |     8 ++++----                                
   trunk/boost/math/special_functions/gamma.hpp                |     3 +--                                     
   4 files changed, 8 insertions(+), 9 deletions(-)

Modified: trunk/boost/math/distributions/non_central_chi_squared.hpp
==============================================================================
--- trunk/boost/math/distributions/non_central_chi_squared.hpp	(original)
+++ trunk/boost/math/distributions/non_central_chi_squared.hpp	2008-08-06 04:47:31 EDT (Wed, 06 Aug 2008)
@@ -113,7 +113,7 @@
             // *before* the largest term so that backwards iteration
             // is strictly converging.
             //
-            for(int i = k - 1; i >= 0; --i)
+            for(i = k - 1; i >= 0; --i)
             {
                T term = poisb * gamb;
                sum += term;

Modified: trunk/boost/math/special_functions/beta.hpp
==============================================================================
--- trunk/boost/math/special_functions/beta.hpp	(original)
+++ trunk/boost/math/special_functions/beta.hpp	2008-08-06 04:47:31 EDT (Wed, 06 Aug 2008)
@@ -308,8 +308,8 @@
       // general case:
       T b1 = (x * cgh) / agh;
       T b2 = (y * cgh) / bgh;
-      T l1 = a * log(b1);
-      T l2 = b * log(b2);
+      l1 = a * log(b1);
+      l2 = b * log(b2);
       if((l1 >= tools::log_max_value<T>())
          || (l1 <= tools::log_min_value<T>())
          || (l2 >= tools::log_max_value<T>())

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	2008-08-06 04:47:31 EDT (Wed, 06 Aug 2008)
@@ -234,10 +234,10 @@
       workspace[0] = s * s;
       workspace[1] = s * c;
       workspace[2] = (1 - 2 * workspace[0]) / 3;
-      static const BOOST_MATH_INT_TABLE_TYPE(T, int) co3[] = { 1, -13, 13 };
-      workspace[3] = tools::evaluate_polynomial(co3, workspace[0], 3) / (36 * s * c);
-      static const BOOST_MATH_INT_TABLE_TYPE(T, int) co4[] = { 1, 21, -69, 46 };
-      workspace[4] = tools::evaluate_polynomial(co4, workspace[0], 4) / (270 * workspace[0] * c * c);
+      static const BOOST_MATH_INT_TABLE_TYPE(T, int) co12[] = { 1, -13, 13 };
+      workspace[3] = tools::evaluate_polynomial(co12, workspace[0], 3) / (36 * s * c);
+      static const BOOST_MATH_INT_TABLE_TYPE(T, int) co13[] = { 1, 21, -69, 46 };
+      workspace[4] = tools::evaluate_polynomial(co13, workspace[0], 4) / (270 * workspace[0] * c * c);
       x = tools::evaluate_polynomial(workspace, eta, 5);
 #ifdef BOOST_INSTRUMENT
       std::cout << "Estimating x with Temme method 2 (small eta): " << x << std::endl;

Modified: trunk/boost/math/special_functions/gamma.hpp
==============================================================================
--- trunk/boost/math/special_functions/gamma.hpp	(original)
+++ trunk/boost/math/special_functions/gamma.hpp	2008-08-06 04:47:31 EDT (Wed, 06 Aug 2008)
@@ -253,10 +253,9 @@
    {
       // regular evaluation:
       T zgh = static_cast<T>(z + L::g() - boost::math::constants::half<T>());
-      T l = L::lanczos_sum_expG_scaled(z);
       result = log(zgh) - 1;
       result *= z - 0.5f;
-      result += log(l);
+      result += log(L::lanczos_sum_expG_scaled(z));
    }
 
    if(sign)