diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-02-03 00:11:51 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 17:54:36 -0700 |
| commit | acad872c5bb8138cd2b0a065830cb88270f1d55f (patch) | |
| tree | aaaa4b8bde1f584d090fa5d50fcc5a72ccd20b0f /numpy/f2py/doc/multiarray/array_from_pyobj.c | |
| parent | 12fb59edc49c52a0800fa08b2f518cda06fc8d87 (diff) | |
| download | numpy-acad872c5bb8138cd2b0a065830cb88270f1d55f.tar.gz | |
UPD: Use prefixed macros in *.c files except numarray and linalg.
Diffstat (limited to 'numpy/f2py/doc/multiarray/array_from_pyobj.c')
| -rw-r--r-- | numpy/f2py/doc/multiarray/array_from_pyobj.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/numpy/f2py/doc/multiarray/array_from_pyobj.c b/numpy/f2py/doc/multiarray/array_from_pyobj.c index 5a700eecf..03d4aacf6 100644 --- a/numpy/f2py/doc/multiarray/array_from_pyobj.c +++ b/numpy/f2py/doc/multiarray/array_from_pyobj.c @@ -113,7 +113,7 @@ PyArrayObject* array_from_pyobj(const int type_num, if (intent & F2PY_INTENT_OUT) { if ((!(intent & F2PY_INTENT_C)) && (rank>1)) { lazy_transpose(arr); - arr->flags &= ~CONTIGUOUS; + arr->flags &= ~NPY_CONTIGUOUS; } Py_INCREF(arr); } @@ -155,7 +155,7 @@ PyArrayObject* array_from_pyobj(const int type_num, if ((rank>1) && (! (intent & F2PY_INTENT_C))) { lazy_transpose(arr); lazy_transpose(tmp_arr); - tmp_arr->flags &= ~CONTIGUOUS; + tmp_arr->flags &= ~NPY_CONTIGUOUS; } arr = tmp_arr; } @@ -172,7 +172,7 @@ PyArrayObject* array_from_pyobj(const int type_num, if (intent & F2PY_INTENT_OUT) { if ((!(intent & F2PY_INTENT_C)) && (rank>1)) { lazy_transpose(arr); - arr->flags &= ~CONTIGUOUS; + arr->flags &= ~NPY_CONTIGUOUS; } Py_INCREF(arr); } @@ -192,13 +192,13 @@ PyArrayObject* array_from_pyobj(const int type_num, if ((rank>1) && (! (intent & F2PY_INTENT_C))) { PyArrayObject *tmp_arr = NULL; lazy_transpose(arr); - arr->flags &= ~CONTIGUOUS; + arr->flags &= ~NPY_CONTIGUOUS; tmp_arr = (PyArrayObject *) PyArray_CopyFromObject((PyObject *)arr,type_num,0,0); Py_DECREF(arr); arr = tmp_arr; ARR_IS_NULL(arr,"CopyFromObject(Array) failed: intent(fortran)\n"); lazy_transpose(arr); - arr->flags &= ~CONTIGUOUS; + arr->flags &= ~NPY_CONTIGUOUS; } if (intent & F2PY_INTENT_OUT) Py_INCREF(arr); @@ -238,7 +238,7 @@ void lazy_transpose(PyArrayObject* arr) { Changes the order of array strides and dimensions. This corresponds to the lazy transpose of a Numeric array in-situ. Note that this function is assumed to be used even times for a - given array. Otherwise, the caller should set flags &= ~CONTIGUOUS. + given array. Otherwise, the caller should set flags &= ~NPY_CONTIGUOUS. */ int rank,i,s,j; rank = arr->nd; |