diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2012-02-01 16:24:45 -0700 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2012-02-04 16:11:39 -0700 |
| commit | 28214cf236251897038dcedfb50a62a2a2007358 (patch) | |
| tree | 5a6df5beb0037a05ad4476a21341a9284e2980f6 /doc/source/user/c-info.beyond-basics.rst | |
| parent | 95e2e1574bf14ce463489752427274c0d138a6ec (diff) | |
| download | numpy-28214cf236251897038dcedfb50a62a2a2007358.tar.gz | |
DOC: Replace references to macros in old_defines with new.
Also remove swig support for numpy < 1 from numpy.i since it expects
the old macros.
Diffstat (limited to 'doc/source/user/c-info.beyond-basics.rst')
| -rw-r--r-- | doc/source/user/c-info.beyond-basics.rst | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doc/source/user/c-info.beyond-basics.rst b/doc/source/user/c-info.beyond-basics.rst index 9ed2ab386..3437985b6 100644 --- a/doc/source/user/c-info.beyond-basics.rst +++ b/doc/source/user/c-info.beyond-basics.rst @@ -189,7 +189,7 @@ feature follows. PyArray_MultiIter_NEXT(mobj); } -The function :cfunc:`PyArray_RemoveLargest` ( ``multi`` ) can be used to +The function :cfunc:`PyArray_RemoveSmallest` ( ``multi`` ) can be used to take a multi-iterator object and adjust all the iterators so that iteration does not take place over the largest dimension (it makes that dimension of size 1). The code being looped over that makes use @@ -330,7 +330,7 @@ function :cfunc:`PyArray_RegisterCanCast` (from_descr, totype_number, scalarkind) should be used to specify that the data-type object from_descr can be cast to the data-type with type number totype_number. If you are not trying to alter scalar coercion rules, -then use :cdata:`PyArray_NOSCALAR` for the scalarkind argument. +then use :cdata:`NPY_NOSCALAR` for the scalarkind argument. If you want to allow your new data-type to also be able to share in the scalar coercion rules, then you need to specify the scalarkind @@ -340,7 +340,7 @@ available to that function). Then, you can register data-types that can be cast to separately for each scalar kind that may be returned from your user-defined data-type. If you don't register scalar coercion handling, then all of your user-defined data-types will be -seen as :cdata:`PyArray_NOSCALAR`. +seen as :cdata:`NPY_NOSCALAR`. Registering a ufunc loop |