summaryrefslogtreecommitdiff
path: root/numpy/core/src
diff options
context:
space:
mode:
authorTravis Oliphant <oliphant@enthought.com>2006-10-28 09:27:49 +0000
committerTravis Oliphant <oliphant@enthought.com>2006-10-28 09:27:49 +0000
commit585f922308a8af2d85a3c92d0d2bb121fed538fd (patch)
tree22e398404f01305aa71ceddc993a6a33326933e1 /numpy/core/src
parent668574c12f81caf3ee744991a29e47146fb82231 (diff)
downloadnumpy-585f922308a8af2d85a3c92d0d2bb121fed538fd.tar.gz
Use more general notion.
Diffstat (limited to 'numpy/core/src')
-rw-r--r--numpy/core/src/scalartypes.inc.src2
1 files changed, 1 insertions, 1 deletions
diff --git a/numpy/core/src/scalartypes.inc.src b/numpy/core/src/scalartypes.inc.src
index 673303dd2..e3eb7cf6e 100644
--- a/numpy/core/src/scalartypes.inc.src
+++ b/numpy/core/src/scalartypes.inc.src
@@ -270,7 +270,7 @@ PyArray_FromScalar(PyObject *scalar, PyArray_Descr *outcode)
#endif
{
memcpy(PyArray_DATA(r), memptr, PyArray_ITEMSIZE(r));
- if (PyArray_ISOBJECT(r)) {
+ if (PyDataType_FLAGCHK(typecode, NPY_ITEM_HASOBJECT)) {
Py_INCREF(*((PyObject **)memptr));
}
}