diff options
| author | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 00:52:49 +0000 |
|---|---|---|
| committer | Travis Oliphant <oliphant@enthought.com> | 2006-07-08 00:52:49 +0000 |
| commit | 5694ae71ac969247b44951d2caa9820852ff6e21 (patch) | |
| tree | af48b5e9fc7824415df4fe505e15521862aefd6e /numpy/f2py/src | |
| parent | d1b492038476e0da520c97549e39c9284ae64e18 (diff) | |
| download | numpy-5694ae71ac969247b44951d2caa9820852ff6e21.tar.gz | |
More fixes to f2py
Diffstat (limited to 'numpy/f2py/src')
| -rw-r--r-- | numpy/f2py/src/fortranobject.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/numpy/f2py/src/fortranobject.c b/numpy/f2py/src/fortranobject.c index 57fa658d4..0b8beed0d 100644 --- a/numpy/f2py/src/fortranobject.c +++ b/numpy/f2py/src/fortranobject.c @@ -54,11 +54,11 @@ PyFortranObject_New(FortranDataDef* defs, f2py_void_func init) { int n = fp->defs[i].rank-1; v = PyArray_New(&PyArray_Type, n, fp->defs[i].dims.d, PyArray_STRING, NULL, fp->defs[i].data, fp->defs[i].dims.d[n], - FARRAY_FLAGS, NULL); + NPY_FARRAY, NULL); } else { v = PyArray_New(&PyArray_Type, fp->defs[i].rank, fp->defs[i].dims.d, - fp->defs[i].type, NULL, fp->defs[i].data, 0, FARRAY_FLAGS, + fp->defs[i].type, NULL, fp->defs[i].data, 0, NPY_FARRAY, NULL); } if (v==NULL) return NULL; @@ -177,7 +177,7 @@ fortran_getattr(PyFortranObject *fp, char *name) { k = fp->defs[i].rank; if (fp->defs[i].data !=NULL) { /* array is allocated */ PyObject *v = PyArray_New(&PyArray_Type, k, fp->defs[i].dims.d, - fp->defs[i].type, NULL, fp->defs[i].data, 0, FARRAY_FLAGS, + fp->defs[i].type, NULL, fp->defs[i].data, 0, NPY_FARRAY, NULL); if (v==NULL) return NULL; /* Py_INCREF(v); */ @@ -652,7 +652,7 @@ PyArrayObject* array_from_pyobj(const int type_num, F2PY_REPORT_ON_ARRAY_COPY_FROMANY; arr = (PyArrayObject *) \ PyArray_FromAny(obj,PyArray_DescrFromType(type_num), 0,0, - ((intent & F2PY_INTENT_C)?CARRAY_FLAGS:FARRAY_FLAGS) \ + ((intent & F2PY_INTENT_C)?NPY_CARRAY:NPY_FARRAY) \ | FORCECAST, NULL); if (arr==NULL) return NULL; |