diff options
| author | Pauli Virtanen <pav@iki.fi> | 2017-01-19 22:40:09 +0100 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2017-01-19 22:47:19 +0100 |
| commit | acedf6860823234460facf7957e42dc65ab5efad (patch) | |
| tree | c055bb8cd417691ef67ba722563d7728ffec22d4 /numpy/core/include | |
| parent | e4af3fd9f485e9f8d923339d4a632bc83f9ad8d7 (diff) | |
| download | numpy-acedf6860823234460facf7957e42dc65ab5efad.tar.gz | |
ENH: core: change NPY_ITER_OVERLAP_NOT_SAME to NPY_ITER_OVERLAP_ALLOW_SAME
It's clearer to explicitly specify which operands are accessed
elementwise, rather than to list exceptions.
Diffstat (limited to 'numpy/core/include')
| -rw-r--r-- | numpy/core/include/numpy/ndarraytypes.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/numpy/core/include/numpy/ndarraytypes.h b/numpy/core/include/numpy/ndarraytypes.h index 3c5af9408..d2e73d73a 100644 --- a/numpy/core/include/numpy/ndarraytypes.h +++ b/numpy/core/include/numpy/ndarraytypes.h @@ -1045,11 +1045,8 @@ typedef void (NpyIter_GetMultiIndexFunc)(NpyIter *iter, #define NPY_ITER_WRITEMASKED 0x10000000 /* This array is the mask for all WRITEMASKED operands */ #define NPY_ITER_ARRAYMASK 0x20000000 -/* - * Consider this array as overlapping for COPY_IF_OVERLAP, - * even if it is exactly the same as another array. - */ -#define NPY_ITER_OVERLAP_NOT_SAME 0x40000000 +/* Consider identical arrays non-overlapping for COPY_IF_OVERLAP */ +#define NPY_ITER_OVERLAP_ALLOW_SAME 0x40000000 #define NPY_ITER_GLOBAL_FLAGS 0x0000ffff #define NPY_ITER_PER_OP_FLAGS 0xffff0000 |