Commit 684ecc93 authored by Robert Bradshaw's avatar Robert Bradshaw

Merge pull request #125 from bfroehle/_reserved-user-defined-literal

Fix -Wreserved-user-defined-literal error in C++11.
parents a4cac007 10666c9c
...@@ -802,7 +802,7 @@ static CYTHON_INLINE int __Pyx_GetBufferAndValidate( ...@@ -802,7 +802,7 @@ static CYTHON_INLINE int __Pyx_GetBufferAndValidate(
} }
if ((unsigned)buf->itemsize != dtype->size) { if ((unsigned)buf->itemsize != dtype->size) {
PyErr_Format(PyExc_ValueError, PyErr_Format(PyExc_ValueError,
"Item size of buffer (%"PY_FORMAT_SIZE_T"d byte%s) does not match size of '%s' (%"PY_FORMAT_SIZE_T"d byte%s)", "Item size of buffer (%" PY_FORMAT_SIZE_T "d byte%s) does not match size of '%s' (%" PY_FORMAT_SIZE_T "d byte%s)",
buf->itemsize, (buf->itemsize > 1) ? "s" : "", buf->itemsize, (buf->itemsize > 1) ? "s" : "",
dtype->name, (Py_ssize_t)dtype->size, (dtype->size > 1) ? "s" : ""); dtype->name, (Py_ssize_t)dtype->size, (dtype->size > 1) ? "s" : "");
goto fail; goto fail;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment