[Boost-commit] svn:boost r50627 - branches/release/boost/spirit/home/karma/numeric/detail

Subject: [Boost-commit] svn:boost r50627 - branches/release/boost/spirit/home/karma/numeric/detail
From: hartmut.kaiser_at_[hidden]
Date: 2009-01-16 09:01:10

Author: hkaiser
Date: 2009-01-16 09:01:09 EST (Fri, 16 Jan 2009)
New Revision: 50627
URL: http://svn.boost.org/trac/boost/changeset/50627

Log:
Spirit: fixing merge problems
Text files modified: 
   branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp |    27 +++++++++++++++------------             
   1 files changed, 15 insertions(+), 12 deletions(-)

Modified: branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp
==============================================================================
--- branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp	(original)
+++ branches/release/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp	2009-01-16 09:01:09 EST (Fri, 16 Jan 2009)
@@ -75,17 +75,20 @@
         
         inline float absolute_value (float n)
         {
-            return boost::math::signbit(n) ? boost::math::changesign(n) : n;
+            return boost::spirit::math::signbit(n) ? 
+                boost::spirit::math::changesign(n) : n;
         }
         
         inline double absolute_value (double n)
         {
-            return boost::math::signbit(n) ? boost::math::changesign(n) : n;
+            return boost::spirit::math::signbit(n) ? 
+                boost::spirit::math::changesign(n) : n;
         }
         
         inline long double absolute_value (long double n)
         {
-            return boost::math::signbit(n) ? boost::math::changesign(n) : n;
+            return boost::spirit::math::signbit(n) ? 
+                boost::spirit::math::changesign(n) : n;
         }
         
         template <typename T>
@@ -98,17 +101,17 @@
         ///////////////////////////////////////////////////////////////////////
         inline bool is_negative(float n) 
         { 
-            return boost::math::signbit(n); 
+            return boost::spirit::math::signbit(n); 
         }
         
         inline bool is_negative(double n) 
         { 
-            return boost::math::signbit(n); 
+            return boost::spirit::math::signbit(n); 
         }
         
         inline bool is_negative(long double n) 
         { 
-            return boost::math::signbit(n); 
+            return boost::spirit::math::signbit(n); 
         }
         
         template <typename T>
@@ -120,17 +123,17 @@
         ///////////////////////////////////////////////////////////////////////
         inline bool is_zero(float n) 
         { 
-            return boost::math::fpclassify(n) == FP_ZERO; 
+            return boost::spirit::math::fpclassify(n) == FP_ZERO; 
         }
         
         inline bool is_zero(double n) 
         { 
-            return boost::math::fpclassify(n) == FP_ZERO; 
+            return boost::spirit::math::fpclassify(n) == FP_ZERO; 
         }
         
         inline bool is_zero(long double n) 
         { 
-            return boost::math::fpclassify(n) == FP_ZERO; 
+            return boost::spirit::math::fpclassify(n) == FP_ZERO; 
         }
         
         template <typename T>
@@ -486,7 +489,7 @@
         static bool
         call (OutputIterator& sink, float n, RealPolicies const& p)
         {
-            int fpclass = boost::math::fpclassify(n);
+            int fpclass = boost::spirit::math::fpclassify(n);
             if (FP_NAN == fpclass)
                 return RealPolicies::template nan<force_sign, Tag>(sink, n);
             else if (FP_INFINITE == fpclass)
@@ -498,7 +501,7 @@
         static bool
         call (OutputIterator& sink, double n, RealPolicies const& p)
         {
-            int fpclass = boost::math::fpclassify(n);
+            int fpclass = boost::spirit::math::fpclassify(n);
             if (FP_NAN == fpclass)
                 return RealPolicies::template nan<force_sign, Tag>(sink, n);
             else if (FP_INFINITE == fpclass)
@@ -510,7 +513,7 @@
         static bool
         call (OutputIterator& sink, long double n, RealPolicies const& p)
         {
-            int fpclass = boost::math::fpclassify(n);
+            int fpclass = boost::spirit::math::fpclassify(n);
             if (FP_NAN == fpclass)
                 return RealPolicies::template nan<force_sign, Tag>(sink, n);
             else if (FP_INFINITE == fpclass)