diff options
| author | Eric Fode <ericfode@gmail.com> | 2012-07-15 12:00:41 -0400 |
|---|---|---|
| committer | Eric Fode <ericfode@gmail.com> | 2012-07-15 12:00:41 -0400 |
| commit | 78f66726040a87d3d0955f1d437c5a7c745bc632 (patch) | |
| tree | 1132595ccb3c7ac48e1016a225dc10c0942c88ae /numpy | |
| parent | 120c6bdca272717c21ce4d79c29142ef64c457c0 (diff) | |
| download | numpy-78f66726040a87d3d0955f1d437c5a7c745bc632.tar.gz | |
Added cast to error check, and fixed indentation.
Diffstat (limited to 'numpy')
| -rw-r--r-- | numpy/core/src/multiarray/common.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/numpy/core/src/multiarray/common.c b/numpy/core/src/multiarray/common.c index 4973df1be..123ec62e7 100644 --- a/numpy/core/src/multiarray/common.c +++ b/numpy/core/src/multiarray/common.c @@ -36,8 +36,9 @@ _array_find_python_scalar_type(PyObject *op) /* if integer can fit into a longlong then return that*/ if ((PyLong_AsLongLong(op) == -1) && PyErr_Occurred()) { PyErr_Clear(); - if((PyLong_AsUnsignedLongLong(op) == -1) && PyErr_Occurred()){ - PyErr_Clear(); + if ((PyLong_AsUnsignedLongLong(op) == (unsigned long long) -1) + && PyErr_Occurred()){ + PyErr_Clear(); } else { return PyArray_DescrFromType(NPY_ULONGLONG); |