mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-03 08:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merged revisions 79885 via svnmerge from

Browse source 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r79885 | stefan.krah | 2010-04-07 10:24:44 +0200 (Wed, 07 Apr 2010) | 1 line

  Issue #8328: Silence Visual Studio warnings.
........
This commit is contained in:
Stefan Krah 2010-04-07 08:49:55 +00:00
parent a9aedd2011
commit 0091e5ecd0
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Objects/longobject.c
View file

@ -1111,7 +1111,7 @@ PyLong_FromSize_t(size_t ival)
int ndigits = 0;
if (ival < PyLong_BASE)
return PyLong_FromLong(ival);
return PyLong_FromLong((long)ival);
/* Count the number of Python digits. */
t = ival;
while (t) {
@ -2405,7 +2405,7 @@ _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e)
while (x_size < shift_digits)
x_digits[x_size++] = 0;
rem = v_lshift(x_digits + x_size, a->ob_digit, a_size,
shift_bits);
(int)shift_bits);
x_size += a_size;
x_digits[x_size++] = rem;
}
@ -2413,7 +2413,7 @@ _PyLong_Frexp(PyLongObject *a, Py_ssize_t *e)
shift_digits = (a_bits - DBL_MANT_DIG - 2) / PyLong_SHIFT;
shift_bits = (a_bits - DBL_MANT_DIG - 2) % PyLong_SHIFT;
rem = v_rshift(x_digits, a->ob_digit + shift_digits,
a_size - shift_digits, shift_bits);
a_size - shift_digits, (int)shift_bits);
x_size = a_size - shift_digits;
/* For correct rounding below, we need the least significant
bit of x to be 'sticky' for this shift: if any of the bits
@ -2475,7 +2475,7 @@ PyLong_AsDouble(PyObject *v)
"long int too large to convert to float");
return -1.0;
}
return ldexp(x, exponent);
return ldexp(x, (int)exponent);
}
/* Methods */
@ -3492,9 +3492,9 @@ long_true_divide(PyObject *v, PyObject *w)
/* Check whether ldexp result will overflow a double. */
if (shift + x_bits >= DBL_MAX_EXP &&
(shift + x_bits > DBL_MAX_EXP || dx == ldexp(1.0, x_bits)))
(shift + x_bits > DBL_MAX_EXP || dx == ldexp(1.0, (int)x_bits)))
goto overflow;
result = ldexp(dx, shift);
result = ldexp(dx, (int)shift);
success:
return PyFloat_FromDouble(negate ? -result : result);
@ -4362,7 +4362,7 @@ long_bit_length(PyLongObject *v)
Py_DECREF(result);
result = y;
x = (PyLongObject *)PyLong_FromLong(msd_bits);
x = (PyLongObject *)PyLong_FromLong((long)msd_bits);
if (x == NULL)
goto error;
y = (PyLongObject *)long_add(result, x);