8000 Pull request #445, rebased by certik · Pull Request #2840 · numpy/numpy · GitHub
[go: up one dir, main page]
Skip to content

Pull request #445, rebased #2840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Pull request #445, rebased #2840

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8323b57
BUG: Fix problems with ndindex and nditer
87 Sep 19, 2012
272c1d6
STY: Remove unnecessary whitespace changes
87 Sep 19, 2012
3cdd362
API: Remove NpyIter_IsScalar from external API
87 Sep 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
STY: Remove unnecessary whitespace changes
  • Loading branch information
@87 @certik
87 authored and certik committed Dec 16, 2012
commit 272c1d6d9419ccc617f7681abd48c611f966b7b0
1 change: 0 additions & 1 deletion numpy/core/src/multiarray/nditer_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,6 @@ typedef npy_int16 npyiter_opitflags;
&(iter)->iter_flexdata + NIT_RESETDATAPTR_OFFSET(itflags, ndim, nop)))
#define NIT_BASEOFFSETS(iter) ((npy_intp *)( \
&(iter)->iter_flexdata + NIT_BASEOFFSETS_OFFSET(itflags, ndim, nop)))

#define NIT_OPERANDS(iter) ((PyArrayObject **)( \
&(iter)->iter_flexdata + NIT_OPERANDS_OFFSET(itflags, ndim, nop)))
#define NIT_OPITFLAGS(iter) ((npyiter_opitflags *)( \
Expand Down
2 changes: 0 additions & 2 deletions numpy/core/src/multiarray/nditer_pywrap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1812,7 +1812,6 @@ static PyObject *npyiter_has_delayed_bufalloc_get(NewNpyArrayIterObject *self)
"Iterator is invalid");
return NULL;
}

if (NpyIter_HasDelayedBufAlloc(self->iter)) {
Py_RETURN_TRUE;
}
Expand Down Expand Up @@ -1971,7 +1970,6 @@ npyiter_seq_item(NewNpyArrayIterObject *self, Py_ssize_t i)
return NULL;
}


if (NpyIter_HasDelayedBufAlloc(self->iter)) {
PyErr_SetString(PyExc_ValueError,
"Iterator construction used delayed buffer allocation, "
Expand Down
0