GitHub-Proxy/eigen
1
0
Fork 0
mirror of https://gitlab.com/libeigen/eigen.git synced 2025-08-13 12:19:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix parenthesis min/max issue in mpreal

Browse Source
This commit is contained in:
Gael Guennebaud 2013-10-29 17:43:21 +01:00
parent 7fae9b358d
commit 5974685866
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
unsupported/test/mpreal/mpreal.h
View File

@ -1262,9 +1262,9 @@ inline const mpreal mpreal::operator-()const
inline const mpreal operator-(const mpreal& a, const mpreal& b) inline const mpreal operator-(const mpreal& a, const mpreal& b)
{ {
mpreal c(0, std::max(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr()))); mpreal c(0, (std::max)(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr())));
mpfr_sub(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd()); mpfr_sub(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd());
return c; return c;
} }
inline const mpreal operator-(const double b, const mpreal& a) inline const mpreal operator-(const double b, const mpreal& a)
@ -1379,7 +1379,7 @@ inline mpreal& mpreal::operator*=(const int v)
inline const mpreal operator*(const mpreal& a, const mpreal& b) inline const mpreal operator*(const mpreal& a, const mpreal& b)
{ {
mpreal c(0, std::max(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr()))); mpreal c(0, (std::max)(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr())));
mpfr_mul(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd()); mpfr_mul(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd());
return c; return c;
} }
@ -1455,7 +1455,7 @@ inline mpreal& mpreal::operator/=(const int v)
inline const mpreal operator/(const mpreal& a, const mpreal& b) inline const mpreal operator/(const mpreal& a, const mpreal& b)
{ {
mpreal c(0, std::max(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr()))); mpreal c(0, (std::max)(mpfr_get_prec(a.mpfr_ptr()), mpfr_get_prec(b.mpfr_ptr())));
mpfr_div(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd()); mpfr_div(c.mpfr_ptr(), a.mpfr_srcptr(), b.mpfr_srcptr(), mpreal::get_default_rnd());
return c; return c;
} }
@ -2393,7 +2393,7 @@ inline const mpreal const_catalan (mp_prec_t p, mp_rnd_t r)
return x; return x;
} }
inline const mpreal const_infinity (int sign, mp_prec_t p, mp_rnd_t r) inline const mpreal const_infinity (int sign, mp_prec_t p, mp_rnd_t /*r*/)
{ {
mpreal x(0, p); mpreal x(0, p);
mpfr_set_inf(x.mpfr_ptr(), sign); mpfr_set_inf(x.mpfr_ptr(), sign);