diff options
| -rw-r--r-- | numpy/core/src/multiarraymodule.c | 3 | ||||
| -rw-r--r-- | numpy/version.py | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/core/src/multiarraymodule.c b/numpy/core/src/multiarraymodule.c index d290df270..1bee59462 100644 --- a/numpy/core/src/multiarraymodule.c +++ b/numpy/core/src/multiarraymodule.c @@ -1753,7 +1753,8 @@ PyArray_ConvertToCommonType(PyObject *op, int *retn) if (PyArray_Check(op)) { for (i=0; i<n; i++) { - mps[i] = array_big_item((PyArrayObject *)op, i); + mps[i] = (PyArrayObject *)\ + array_big_item((PyArrayObject *)op, i); } if (!PyArray_ISCARRAY(op)) { for (i=0; i<n; i++) { diff --git a/numpy/version.py b/numpy/version.py index e7860c79d..0d8eae956 100644 --- a/numpy/version.py +++ b/numpy/version.py @@ -1,5 +1,5 @@ -version='1.0' -release=False +version='1.0rc2' +release=True if not release: import os |