cpython: 110ec861e5ea (original) (raw)

Mercurial > cpython

changeset 106409:110ec861e5ea 2.7

Issue #27867: Fixed merging error. [#27867]

Serhiy Storchaka storchaka@gmail.com
date	Sat, 04 Feb 2017 11:10:25 +0200
parents	17d0cfc64a32
children	3fd198b80f29
files	Include/sliceobject.h
diffstat	1 files changed, 1 insertions(+), 1 deletions(-)[+] [-] Include/sliceobject.h 2

line wrap: on

line diff

--- a/Include/sliceobject.h +++ b/Include/sliceobject.h @@ -41,7 +41,7 @@ PyAPI_FUNC(int) PySlice_GetIndicesEx(PyS #define PySlice_GetIndicesEx(slice, length, start, stop, step, slicelen) ( [](#l1.4) _PySlice_Unpack((PyObject )(slice), (start), (stop), (step)) < 0 ? [](#l1.5) (((slicelen) = 0), -1) : [](#l1.6)

((*(slicelen) = PySlice_AdjustIndices((length), (start), (stop), *(step))), [](#l1.7)

((*(slicelen) = _PySlice_AdjustIndices((length), (start), (stop), *(step))), [](#l1.8) 0)) PyAPI_FUNC(int) _PySlice_Unpack(PyObject *slice, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step);