[Boost-commit] svn:boost r49149 - in branches/bcbboost/boost: archive math/distributions math/special_functions spirit/home/qi/operator spirit/home/support/detail

Subject: [Boost-commit] svn:boost r49149 - in branches/bcbboost/boost: archive math/distributions math/special_functions spirit/home/qi/operator spirit/home/support/detail
From: nicola.musatti_at_[hidden]
Date: 2008-10-06 15:59:35

Author: nmusatti
Date: 2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
New Revision: 49149
URL: http://svn.boost.org/trac/boost/changeset/49149

Log:
Merge from trunk
Text files modified: 
   branches/bcbboost/boost/archive/basic_binary_iprimitive.hpp          |    22 +++++++++-------------                  
   branches/bcbboost/boost/archive/basic_binary_oprimitive.hpp          |    23 ++++++++++-------------                 
   branches/bcbboost/boost/math/distributions/non_central_f.hpp         |     5 +++--                                   
   branches/bcbboost/boost/math/special_functions/expint.hpp            |     3 ++-                                     
   branches/bcbboost/boost/spirit/home/qi/operator/difference.hpp       |    10 ++++++----                              
   branches/bcbboost/boost/spirit/home/qi/operator/list.hpp             |     4 ++--                                    
   branches/bcbboost/boost/spirit/home/support/detail/what_function.hpp |     2 +-                                      
   7 files changed, 33 insertions(+), 36 deletions(-)

Modified: branches/bcbboost/boost/archive/basic_binary_iprimitive.hpp
==============================================================================
--- branches/bcbboost/boost/archive/basic_binary_iprimitive.hpp	(original)
+++ branches/bcbboost/boost/archive/basic_binary_iprimitive.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -122,20 +122,16 @@
     // we provide an optimized load for all fundamental types
     // typedef serialization::is_bitwise_serializable<mpl::_1> 
     // use_array_optimization;
-#if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
-    struct use_array_optimization {
-      template <class T>
-      struct apply
-      {
-        typedef typename boost::serialization::is_bitwise_serializable<T>::type type;
-      };
+    struct use_array_optimization {  
+        template <class T>  
+        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)  
+            struct apply {  
+                typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;  
+            };
+        #else
+            struct apply : public boost::serialization::is_bitwise_serializable<T> {};  
+        #endif
     };
-#else
-    struct use_array_optimization {
-      template <class T>
-      struct apply : public boost::serialization::is_bitwise_serializable<T> {};
-    };
-#endif
 
     // the optimized load_array dispatches to load_binary 
     template <class ValueType>

Modified: branches/bcbboost/boost/archive/basic_binary_oprimitive.hpp
==============================================================================
--- branches/bcbboost/boost/archive/basic_binary_oprimitive.hpp	(original)
+++ branches/bcbboost/boost/archive/basic_binary_oprimitive.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -116,22 +116,19 @@
 
     // we provide an optimized save for all fundamental types
     // typedef serialization::is_bitwise_serializable<mpl::_1> 
-    //  use_array_optimization;
+    // use_array_optimization;
     // workaround without using mpl lambdas
-#if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)
     struct use_array_optimization {
-      template <class T>
-      struct apply
-      {
-        typedef typename boost::serialization::is_bitwise_serializable<T>::type type;
-      };
+        template <class T>  
+        #if defined(BOOST_NO_DEPENDENT_NESTED_DERIVATIONS)  
+            struct apply {  
+                typedef BOOST_DEDUCED_TYPENAME boost::serialization::is_bitwise_serializable<T>::type type;  
+            };
+        #else
+            struct apply : public boost::serialization::is_bitwise_serializable<T> {};  
+        #endif
     };
-#else
-    struct use_array_optimization {
-      template <class T>
-      struct apply : public boost::serialization::is_bitwise_serializable<T> {};
-    };
-#endif
+    
 
     // the optimized save_array dispatches to save_binary 
     template <class ValueType>

Modified: branches/bcbboost/boost/math/distributions/non_central_f.hpp
==============================================================================
--- branches/bcbboost/boost/math/distributions/non_central_f.hpp	(original)
+++ branches/bcbboost/boost/math/distributions/non_central_f.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -12,6 +12,7 @@
 
 #include <boost/math/distributions/non_central_beta.hpp>
 #include <boost/math/distributions/detail/generic_mode.hpp>
+#include <boost/math/special_functions/pow.hpp>
 
 namespace boost
 {
@@ -253,8 +254,8 @@
             + 4 * (10 + m) * (-2 + m + n) * l3
             + (10 + m) * l4))
             /
-            ((-8 + m) * (-6 + m) * pow(n * (-2 + m + n)
-            + 2 * (-2 + m + n) * l + l2, 2));
+            ((-8 + m) * (-6 + m) * boost::math::pow<2>(n * (-2 + m + n)
+            + 2 * (-2 + m + n) * l + l2));
             return result;
       } // kurtosis_excess
 

Modified: branches/bcbboost/boost/math/special_functions/expint.hpp
==============================================================================
--- branches/bcbboost/boost/math/special_functions/expint.hpp	(original)
+++ branches/bcbboost/boost/math/special_functions/expint.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -17,6 +17,7 @@
 #include <boost/math/policies/error_handling.hpp>
 #include <boost/math/special_functions/digamma.hpp>
 #include <boost/math/special_functions/log1p.hpp>
+#include <boost/math/special_functions/pow.hpp>
 
 namespace boost{ namespace math{
 
@@ -416,7 +417,7 @@
       fact *= ++k;
    }
    BOOST_MATH_INSTRUMENT_VARIABLE(result)
-   result += pow(-z, (int)n - 1) 
+   result += pow(-z, static_cast<T>(n - 1)) 
       * (boost::math::digamma(static_cast<T>(n)) - log(z)) / fact;
    BOOST_MATH_INSTRUMENT_VARIABLE(result)
 

Modified: branches/bcbboost/boost/spirit/home/qi/operator/difference.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/qi/operator/difference.hpp	(original)
+++ branches/bcbboost/boost/spirit/home/qi/operator/difference.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -56,14 +56,16 @@
 
             // Try RHS first
             Iterator start = first;
-            if (rdirector::parse(right(component), first, last, context, skipper, unused))
+            if (rdirector::parse(spirit::right(component), first, last, context, 
+                skipper, unused))
             {
                 // RHS succeeds, we fail.
                 first = start;
                 return false;
             }
             // RHS fails, now try LHS
-            return ldirector::parse(left(component), first, last, context, skipper, attr);
+            return ldirector::parse(spirit::left(component), first, last, 
+                context, skipper, attr);
         }
 
         template <typename Component, typename Context>
@@ -79,9 +81,9 @@
                 result_of::right<Component>::type::director
             rdirector;
 
-            result += ldirector::what(left(component), ctx);
+            result += ldirector::what(spirit::left(component), ctx);
             result += ", ";
-            result += rdirector::what(right(component), ctx);
+            result += rdirector::what(spirit::right(component), ctx);
             result += "]";
             return result;
         }

Modified: branches/bcbboost/boost/spirit/home/qi/operator/list.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/qi/operator/list.hpp	(original)
+++ branches/bcbboost/boost/spirit/home/qi/operator/list.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -85,9 +85,9 @@
                 result_of::right<Component>::type::director
             rdirector;
 
-            result += ldirector::what(left(component), ctx);
+            result += ldirector::what(spirit::left(component), ctx);
             result += ", ";
-            result += rdirector::what(right(component), ctx);
+            result += rdirector::what(spirit::right(component), ctx);
             result += "]";
             return result;
         }

Modified: branches/bcbboost/boost/spirit/home/support/detail/what_function.hpp
==============================================================================
--- branches/bcbboost/boost/spirit/home/support/detail/what_function.hpp	(original)
+++ branches/bcbboost/boost/spirit/home/support/detail/what_function.hpp	2008-10-06 15:59:35 EDT (Mon, 06 Oct 2008)
@@ -15,7 +15,7 @@
     struct what_function
     {
         what_function(std::string& str, Context const& ctx)
-          : str(str), first(true), ctx(ctx)
+          : str(str), ctx(ctx), first(true)
         {
         }