From 656b8ba14074b62b0560748324fd66186410e396 Mon Sep 17 00:00:00 2001 From: Travis Oliphant Date: Wed, 25 Jan 2006 23:58:35 +0000 Subject: Simplify hasobject checks by setting hasobject to 1 for OBJECT_Descr data-type descriptor. --- numpy/core/src/arrayobject.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'numpy/core/src/arrayobject.c') diff --git a/numpy/core/src/arrayobject.c b/numpy/core/src/arrayobject.c index 33a86efe5..033eef26d 100644 --- a/numpy/core/src/arrayobject.c +++ b/numpy/core/src/arrayobject.c @@ -3762,10 +3762,10 @@ PyArray_NewFromDescr(PyTypeObject *subtype, PyArray_Descr *descr, int nd, /* It is bad to have unitialized OBJECT pointers */ /* which could also be sub-fields of a VOID array */ - if (descr == &OBJECT_Descr || descr->hasobject) { - if (descr->hasobject) { + if (descr->hasobject) { + if (descr != &OBJECT_Descr) { PyErr_SetString(PyExc_TypeError, - "fields with object members "\ + "fields with object members " \ "not yet supported."); goto fail; } -- cgit v1.2.1