diff options
| author | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2017-05-04 08:38:17 +0000 |
|---|---|---|
| committer | vlefevre <vlefevre@280ebfd0-de03-0410-8827-d642c229c3f4> | 2017-05-04 08:38:17 +0000 |
| commit | 87ff38458263c9a9ed79a7ebd547fd32a66ae843 (patch) | |
| tree | c8f4ed14e7e8d301fb3e00ba8ad43412733f2c5f /src/div_ui.c | |
| parent | 0fb11bc4c54b2428a02016f68eae553c089f95ae (diff) | |
| download | mpfr-87ff38458263c9a9ed79a7ebd547fd32a66ae843.tar.gz | |
Merged r11198-11280 from the trunk; no conflicts but additional changes:
* About r11271 (src/add1sp.c), which introduces new special code
(function mpfr_add1sp1n), handle MPFR_RNDF in the same way as done
in similar existing special code (mpfr_add1sp1 and mpfr_add1sp2).
* In mpfr_add1sp3, do the same thing (this should have been done in
r11172, where this function was introduced via a merge).
* About r11279 (src/sub1sp.c, tests/tsub1sp.c), which introduces new
special code (function mpfr_sub1sp1n), do the same thing.
In tests/tsub1sp.c, s/RND_LOOP/RND_LOOP_NO_RNDF/ as usual to avoid
a failure.
* Note: concerning mpfr_sub1sp3, RNDF support was added at the same
time of the merge in r11179.
* Some style changes related to RNDF, in particular for consistency.
git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/faithful@11455 280ebfd0-de03-0410-8827-d642c229c3f4
Diffstat (limited to 'src/div_ui.c')
| -rw-r--r-- | src/div_ui.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/div_ui.c b/src/div_ui.c index 741fb0d82..633c8c04f 100644 --- a/src/div_ui.c +++ b/src/div_ui.c @@ -107,7 +107,7 @@ mpfr_div_ui (mpfr_ptr y, mpfr_srcptr x, unsigned long int u, mpfr_rnd_t rnd_mode /* don't use tmp=yp since the mpn_lshift call below requires yp >= tmp+1 */ tmp = MPFR_TMP_LIMBS_ALLOC (yn + 1); - MPFR_STAT_STATIC_ASSERT ((mp_limb_t) -1 >= (unsigned long) -1); + MPFR_STAT_STATIC_ASSERT (MPFR_LIMB_MAX >= ULONG_MAX); if (dif >= 0) c = mpn_divrem_1 (tmp, dif, xp, xn, u); /* used all the dividend */ else /* dif < 0 i.e. xn > yn, don't use the (-dif) low limbs from x */ |