[Boost-commit] svn:boost r85573 - trunk/boost/multiprecision

Subject: [Boost-commit] svn:boost r85573 - trunk/boost/multiprecision
From: john_at_[hidden]
Date: 2013-09-05 12:08:23

Author: johnmaddock
Date: 2013-09-05 12:08:23 EDT (Thu, 05 Sep 2013)
New Revision: 85573
URL: http://svn.boost.org/trac/boost/changeset/85573

Log:
Fix some invalid comparisons (GCC compiler errors).

Text files modified: 
   trunk/boost/multiprecision/mpfi.hpp |     4 ++--                                    
   trunk/boost/multiprecision/mpfr.hpp |     4 ++--                                    
   2 files changed, 4 insertions(+), 4 deletions(-)

Modified: trunk/boost/multiprecision/mpfi.hpp
==============================================================================
--- trunk/boost/multiprecision/mpfi.hpp	Thu Sep  5 11:56:17 2013	(r85572)
+++ trunk/boost/multiprecision/mpfi.hpp	2013-09-05 12:08:23 EDT (Thu, 05 Sep 2013)	(r85573)
@@ -477,7 +477,7 @@
 template <unsigned D1, unsigned D2>
 inline void eval_multiply(mpfi_float_backend<D1>& result, const mpfi_float_backend<D2>& o)
 {
-   if(&result == &o)
+   if((void*)&result == (void*)&o)
       mpfi_sqr(result.data(), o.data());
    else
       mpfi_mul(result.data(), result.data(), o.data());
@@ -612,7 +612,7 @@
 template <unsigned D1, unsigned D2, unsigned D3>
 inline void eval_multiply(mpfi_float_backend<D1>& a, const mpfi_float_backend<D2>& x, const mpfi_float_backend<D3>& y)
 {
-   if(&x == &y)
+   if((void*)&x == (void*)&y)
       mpfi_sqr(a.data(), x.data());
    else
       mpfi_mul(a.data(), x.data(), y.data());

Modified: trunk/boost/multiprecision/mpfr.hpp
==============================================================================
--- trunk/boost/multiprecision/mpfr.hpp	Thu Sep  5 11:56:17 2013	(r85572)
+++ trunk/boost/multiprecision/mpfr.hpp	2013-09-05 12:08:23 EDT (Thu, 05 Sep 2013)	(r85573)
@@ -952,7 +952,7 @@
 template <unsigned D1, unsigned D2, mpfr_allocation_type A1, mpfr_allocation_type A2>
 inline void eval_multiply(mpfr_float_backend<D1, A1>& result, const mpfr_float_backend<D2, A2>& o)
 {
-   if(&o == &result)
+   if((void*)&o == (void*)&result)
       mpfr_sqr(result.data(), o.data(), GMP_RNDN);
    else
       mpfr_mul(result.data(), result.data(), o.data(), GMP_RNDN);
@@ -1087,7 +1087,7 @@
 template <unsigned D1, unsigned D2, mpfr_allocation_type A1, mpfr_allocation_type A2, unsigned D3>
 inline void eval_multiply(mpfr_float_backend<D1, A1>& a, const mpfr_float_backend<D2, A2>& x, const mpfr_float_backend<D3>& y)
 {
-   if(&x == &y)
+   if((void*)&x == (void*)&y)
       mpfr_sqr(a.data(), x.data(), GMP_RNDN);
    else
       mpfr_mul(a.data(), x.data(), y.data(), GMP_RNDN);