Commit 2095d248 authored by Guido van Rossum's avatar Guido van Rossum

Tweaks to keep the Microsoft compiler quiet.

parent 644a12b0
...@@ -168,7 +168,7 @@ lookmapping(mp, key, hash) ...@@ -168,7 +168,7 @@ lookmapping(mp, key, hash)
register unsigned incr; register unsigned incr;
register unsigned long sum = (unsigned long) hash; register unsigned long sum = (unsigned long) hash;
register mappingentry *freeslot = NULL; register mappingentry *freeslot = NULL;
register int mask = mp->ma_size-1; register unsigned int mask = mp->ma_size-1;
mappingentry *ep0 = mp->ma_table; mappingentry *ep0 = mp->ma_table;
register mappingentry *ep; register mappingentry *ep;
/* We must come up with (i, incr) such that 0 <= i < ma_size /* We must come up with (i, incr) such that 0 <= i < ma_size
......
...@@ -67,7 +67,7 @@ newlistobject(size) ...@@ -67,7 +67,7 @@ newlistobject(size)
} }
nbytes = size * sizeof(object *); nbytes = size * sizeof(object *);
/* Check for overflow */ /* Check for overflow */
if (nbytes / sizeof(object *) != size) { if (nbytes / sizeof(object *) != (size_t)size) {
return err_nomem(); return err_nomem();
} }
op = (listobject *) malloc(sizeof(listobject)); op = (listobject *) malloc(sizeof(listobject));
......
...@@ -101,7 +101,7 @@ newlongobject(ival) ...@@ -101,7 +101,7 @@ newlongobject(ival)
v->ob_size = -(v->ob_size); v->ob_size = -(v->ob_size);
} }
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
v->ob_digit[i] = t & MASK; v->ob_digit[i] = (digit) (t & MASK);
t >>= SHIFT; t >>= SHIFT;
} }
v = long_normalize(v); v = long_normalize(v);
...@@ -122,7 +122,7 @@ PyLong_FromUnsignedLong(ival) ...@@ -122,7 +122,7 @@ PyLong_FromUnsignedLong(ival)
unsigned long t = ival; unsigned long t = ival;
int i; int i;
for (i = 0; i < 5; i++) { for (i = 0; i < 5; i++) {
v->ob_digit[i] = t & MASK; v->ob_digit[i] = (digit) (t & MASK);
t >>= SHIFT; t >>= SHIFT;
} }
v = long_normalize(v); v = long_normalize(v);
...@@ -158,7 +158,7 @@ dnewlongobject(dval) ...@@ -158,7 +158,7 @@ dnewlongobject(dval)
frac = ldexp(frac, (expo-1) % SHIFT + 1); frac = ldexp(frac, (expo-1) % SHIFT + 1);
for (i = ndig; --i >= 0; ) { for (i = ndig; --i >= 0; ) {
long bits = (long)frac; long bits = (long)frac;
v->ob_digit[i] = bits; v->ob_digit[i] = (digit) bits;
frac = frac - (double)bits; frac = frac - (double)bits;
frac = ldexp(frac, SHIFT); frac = ldexp(frac, SHIFT);
} }
...@@ -293,10 +293,10 @@ muladd1(a, n, extra) ...@@ -293,10 +293,10 @@ muladd1(a, n, extra)
return NULL; return NULL;
for (i = 0; i < size_a; ++i) { for (i = 0; i < size_a; ++i) {
carry += (twodigits)a->ob_digit[i] * n; carry += (twodigits)a->ob_digit[i] * n;
z->ob_digit[i] = carry & MASK; z->ob_digit[i] = (digit) (carry & MASK);
carry >>= SHIFT; carry >>= SHIFT;
} }
z->ob_digit[i] = carry; z->ob_digit[i] = (digit) carry;
return long_normalize(z); return long_normalize(z);
} }
...@@ -321,10 +321,10 @@ divrem1(a, n, prem) ...@@ -321,10 +321,10 @@ divrem1(a, n, prem)
return NULL; return NULL;
for (i = size; --i >= 0; ) { for (i = size; --i >= 0; ) {
rem = (rem << SHIFT) + a->ob_digit[i]; rem = (rem << SHIFT) + a->ob_digit[i];
z->ob_digit[i] = rem/n; z->ob_digit[i] = (digit) (rem/n);
rem %= n; rem %= n;
} }
*prem = rem; *prem = (digit) rem;
return long_normalize(z); return long_normalize(z);
} }
...@@ -383,7 +383,7 @@ long_format(aa, base) ...@@ -383,7 +383,7 @@ long_format(aa, base)
else else
rem += 'A'-10; rem += 'A'-10;
assert(p > GETSTRINGVALUE(str)); assert(p > GETSTRINGVALUE(str));
*--p = rem; *--p = (char) rem;
DECREF(a); DECREF(a);
a = temp; a = temp;
SIGCHECK({ SIGCHECK({
...@@ -552,7 +552,7 @@ x_divrem(v1, w1, prem) ...@@ -552,7 +552,7 @@ x_divrem(v1, w1, prem)
longobject **prem; longobject **prem;
{ {
int size_v = ABS(v1->ob_size), size_w = ABS(w1->ob_size); int size_v = ABS(v1->ob_size), size_w = ABS(w1->ob_size);
digit d = (twodigits)BASE / (w1->ob_digit[size_w-1] + 1); digit d = (digit) ((twodigits)BASE / (w1->ob_digit[size_w-1] + 1));
longobject *v = mul1(v1, d); longobject *v = mul1(v1, d);
longobject *w = mul1(w1, d); longobject *w = mul1(w1, d);
longobject *a; longobject *a;
...@@ -599,7 +599,7 @@ x_divrem(v1, w1, prem) ...@@ -599,7 +599,7 @@ x_divrem(v1, w1, prem)
for (i = 0; i < size_w && i+k < size_v; ++i) { for (i = 0; i < size_w && i+k < size_v; ++i) {
twodigits z = w->ob_digit[i] * q; twodigits z = w->ob_digit[i] * q;
digit zz = z >> SHIFT; digit zz = (digit) (z >> SHIFT);
carry += v->ob_digit[i+k] - z + ((twodigits)zz << SHIFT); carry += v->ob_digit[i+k] - z + ((twodigits)zz << SHIFT);
v->ob_digit[i+k] = carry & MASK; v->ob_digit[i+k] = carry & MASK;
carry = (carry >> SHIFT) - zz; carry = (carry >> SHIFT) - zz;
...@@ -611,10 +611,10 @@ x_divrem(v1, w1, prem) ...@@ -611,10 +611,10 @@ x_divrem(v1, w1, prem)
} }
if (carry == 0) if (carry == 0)
a->ob_digit[k] = q; a->ob_digit[k] = (digit) q;
else { else {
assert(carry == -1); assert(carry == -1);
a->ob_digit[k] = q-1; a->ob_digit[k] = (digit) q-1;
carry = 0; carry = 0;
for (i = 0; i < size_w && i+k < size_v; ++i) { for (i = 0; i < size_w && i+k < size_v; ++i) {
carry += v->ob_digit[i+k] + w->ob_digit[i]; carry += v->ob_digit[i+k] + w->ob_digit[i];
...@@ -903,13 +903,13 @@ long_mul(a, b) ...@@ -903,13 +903,13 @@ long_mul(a, b)
}) })
for (j = 0; j < size_b; ++j) { for (j = 0; j < size_b; ++j) {
carry += z->ob_digit[i+j] + b->ob_digit[j] * f; carry += z->ob_digit[i+j] + b->ob_digit[j] * f;
z->ob_digit[i+j] = carry & MASK; z->ob_digit[i+j] = (digit) (carry & MASK);
carry >>= SHIFT; carry >>= SHIFT;
} }
for (; carry != 0; ++j) { for (; carry != 0; ++j) {
assert(i+j < z->ob_size); assert(i+j < z->ob_size);
carry += z->ob_digit[i+j]; carry += z->ob_digit[i+j];
z->ob_digit[i+j] = carry & MASK; z->ob_digit[i+j] = (digit) (carry & MASK);
carry >>= SHIFT; carry >>= SHIFT;
} }
} }
......
...@@ -168,7 +168,7 @@ lookmapping(mp, key, hash) ...@@ -168,7 +168,7 @@ lookmapping(mp, key, hash)
register unsigned incr; register unsigned incr;
register unsigned long sum = (unsigned long) hash; register unsigned long sum = (unsigned long) hash;
register mappingentry *freeslot = NULL; register mappingentry *freeslot = NULL;
register int mask = mp->ma_size-1; register unsigned int mask = mp->ma_size-1;
mappingentry *ep0 = mp->ma_table; mappingentry *ep0 = mp->ma_table;
register mappingentry *ep; register mappingentry *ep;
/* We must come up with (i, incr) such that 0 <= i < ma_size /* We must come up with (i, incr) such that 0 <= i < ma_size
......
...@@ -327,7 +327,7 @@ string_repeat(a, n) ...@@ -327,7 +327,7 @@ string_repeat(a, n)
register int n; register int n;
{ {
register int i; register int i;
register unsigned int size; register int size;
register stringobject *op; register stringobject *op;
if (n < 0) if (n < 0)
n = 0; n = 0;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment