[PPL-devel] [GIT] ppl/ppl(master): mp_bitcnt_t is not present in gmp 3.

[Abramo Bagnara]

Module: ppl/ppl
Branch: master
Commit: 0426fd6f655b115197d632e43a59bbf58826a417
URL:    http://www.cs.unipr.it/git/gitweb.cgi?p=ppl/ppl.git;a=commit;h=0426fd6f655b115197d632e43a59bbf58826a417

Author: Abramo Bagnara <abramo.bagnara at gmail.com>
Date:   Thu Feb 23 14:30:50 2012 +0100

mp_bitcnt_t is not present in gmp 3.

---

 src/Bit_Row.inlines.hh       |    8 ++++----
 src/checked_float.inlines.hh |    4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/Bit_Row.inlines.hh b/src/Bit_Row.inlines.hh
index 46a1236..159cf48 100644
--- a/src/Bit_Row.inlines.hh
+++ b/src/Bit_Row.inlines.hh
@@ -58,13 +58,13 @@ Bit_Row::Bit_Row(const Bit_Row& y, const Bit_Row& z) {
   if (y_size < z_size) {
     PPL_ASSERT(static_cast<unsigned long>(z_size)
            <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB);
-    mpz_init2(vec, static_cast<mp_bitcnt_t>(z_size) * PPL_BITS_PER_GMP_LIMB);
+    mpz_init2(vec, static_cast<unsigned long>(z_size) * PPL_BITS_PER_GMP_LIMB);
     union_helper(y, z);
   }
   else {
     PPL_ASSERT(static_cast<unsigned long>(y_size)
            <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB);
-    mpz_init2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB);
+    mpz_init2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB);
     union_helper(z, y);
   }
 }
@@ -136,13 +136,13 @@ Bit_Row::union_assign(const Bit_Row& x, const Bit_Row& y) {
   if (x_size < y_size) {
     PPL_ASSERT(static_cast<unsigned long>(y_size)
                <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB);
-    mpz_realloc2(vec, static_cast<mp_bitcnt_t>(y_size) * PPL_BITS_PER_GMP_LIMB);
+    mpz_realloc2(vec, static_cast<unsigned long>(y_size) * PPL_BITS_PER_GMP_LIMB);
     union_helper(x, y);
   }
   else {
     PPL_ASSERT(static_cast<unsigned long>(x_size)
            <= ULONG_MAX / PPL_BITS_PER_GMP_LIMB);
-    mpz_realloc2(vec, static_cast<mp_bitcnt_t>(x_size) * PPL_BITS_PER_GMP_LIMB);
+    mpz_realloc2(vec, static_cast<unsigned long>(x_size) * PPL_BITS_PER_GMP_LIMB);
     union_helper(y, x);
   }
 }
diff --git a/src/checked_float.inlines.hh b/src/checked_float.inlines.hh
index 029bc6e..03e1bc7 100644
--- a/src/checked_float.inlines.hh
+++ b/src/checked_float.inlines.hh
@@ -886,11 +886,11 @@ assign_float_mpq(T& to, const mpq_class& from, Rounding_Dir dir) {
   mpz_init(mantissa);
   long shift = static_cast<long>(needed_bits) - exponent;
   if (shift > 0) {
-    mpz_mul_2exp(mantissa, numer_z, static_cast<mp_bitcnt_t>(shift));
+    mpz_mul_2exp(mantissa, numer_z, static_cast<unsigned long>(shift));
     numer_z = mantissa;
   }
   else if (shift < 0) {
-    mpz_mul_2exp(mantissa, denom_z, static_cast<mp_bitcnt_t>(-shift));
+    mpz_mul_2exp(mantissa, denom_z, static_cast<unsigned long>(-shift));
     denom_z = mantissa;
   }
   mpz_t r;