diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2013-09-03 19:26:17 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2013-09-03 19:38:48 -0600 |
| commit | 3c8eb4eb396bd5227f2d8298ce60be0c4848fe0e (patch) | |
| tree | 1a27af22d9e5f42b79dbd71704d0818f4d426d6c | |
| parent | 545dc98f6f45218132e4581040b54d68725396c0 (diff) | |
| download | numpy-3c8eb4eb396bd5227f2d8298ce60be0c4848fe0e.tar.gz | |
BUG: PyArray_PyIntAsIntp had variable size check wrong way around.
This bug resulted in using a long type when a long long was required,
resulting in numerous errors when numpy was compiled as 64 bits on
64 bit windows.
| -rw-r--r-- | numpy/core/src/multiarray/conversion_utils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/conversion_utils.c b/numpy/core/src/multiarray/conversion_utils.c index 9450766ab..a0e479ba9 100644 --- a/numpy/core/src/multiarray/conversion_utils.c +++ b/numpy/core/src/multiarray/conversion_utils.c @@ -726,9 +726,9 @@ NPY_NO_EXPORT npy_intp PyArray_PyIntAsIntp(PyObject *o) { #if (NPY_SIZEOF_LONG < NPY_SIZEOF_INTP) - npy_long long_value = -1; + long long long_value = -1; #else - npy_longlong long_value = -1; + long long_value = -1; #endif PyObject *obj, *err; static char *msg = "an integer is required"; |