diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-10-27 20:44:32 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-10-27 20:44:32 +0000 |
| commit | 0051241ac1e06cb13cda0bcc67410f361a97217f (patch) | |
| tree | 4140952a3dc167b607ff4494181759c60a919ce4 /numpy/core/src | |
| parent | cc32637e236429e582db471837cc6bb85b2df1b4 (diff) | |
| download | numpy-0051241ac1e06cb13cda0bcc67410f361a97217f.tar.gz | |
fixes to last commits.
Diffstat (limited to 'numpy/core/src')
| -rw-r--r-- | numpy/core/src/arrayobject.c | 2 | ||||
| -rw-r--r-- | numpy/core/src/scalartypes.inc.src | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 311b7117e..802cf64f1 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -10663,7 +10663,7 @@ arraydescr_typename_get(PyArray_Descr *self) if (PyTypeNum_ISUSERDEF(self->type_num)) { if (typeobj == NULL) { - return PyString_FromFormat("%s%d (%d)", + return PyString_FromFormat("%c%d (%d)", self->kind, self->elsize, self->type_num); diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src index 956ce80fb..ada01d76a 100644 --- a/numpy/core/src/scalartypes.inc.src +++ b/numpy/core/src/scalartypes.inc.src @@ -123,7 +123,7 @@ scalar_value(PyObject *scalar, PyArray_Descr *descr) */ align = descr->alignment; if (align > 1) memloc = ((memloc + align - 1)/align)*align; - return (void *)memloc + return (void *)memloc; #undef _IFCASE #undef _OBJ #undef _CHK |