Commit f46120c0 authored by Lisandro Dalcin's avatar Lisandro Dalcin

Merge branch '0.20.x'

parents 00a26462 9d8f23ec
...@@ -349,7 +349,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) { ...@@ -349,7 +349,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
if (__pyx_code_cache.count == __pyx_code_cache.max_count) { if (__pyx_code_cache.count == __pyx_code_cache.max_count) {
int new_max = __pyx_code_cache.max_count + 64; int new_max = __pyx_code_cache.max_count + 64;
entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Realloc( entries = (__Pyx_CodeObjectCacheEntry*)PyMem_Realloc(
__pyx_code_cache.entries, new_max*sizeof(__Pyx_CodeObjectCacheEntry)); __pyx_code_cache.entries, (size_t)new_max*sizeof(__Pyx_CodeObjectCacheEntry));
if (unlikely(!entries)) { if (unlikely(!entries)) {
return; return;
} }
......
...@@ -140,7 +140,7 @@ static PyObject* __Pyx_PyList_PopIndex(PyObject* L, Py_ssize_t ix) { ...@@ -140,7 +140,7 @@ static PyObject* __Pyx_PyList_PopIndex(PyObject* L, Py_ssize_t ix) {
PyObject* v = PyList_GET_ITEM(L, cix); PyObject* v = PyList_GET_ITEM(L, cix);
Py_SIZE(L) -= 1; Py_SIZE(L) -= 1;
size -= 1; size -= 1;
memmove(&PyList_GET_ITEM(L, cix), &PyList_GET_ITEM(L, cix+1), (size-cix)*sizeof(PyObject*)); memmove(&PyList_GET_ITEM(L, cix), &PyList_GET_ITEM(L, cix+1), (size_t)(size-cix)*sizeof(PyObject*));
return v; return v;
} }
} }
......
...@@ -190,7 +190,7 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int ...@@ -190,7 +190,7 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int
} else if (length == 1) { } else if (length == 1) {
goto return_eq; goto return_eq;
} else { } else {
int result = memcmp(data1, data2, length * kind); int result = memcmp(data1, data2, (size_t)(length * kind));
#if PY_MAJOR_VERSION < 3 #if PY_MAJOR_VERSION < 3
Py_XDECREF(owned_ref); Py_XDECREF(owned_ref);
#endif #endif
...@@ -605,7 +605,7 @@ static int __Pyx_PyBytes_SingleTailmatch(PyObject* self, PyObject* arg, Py_ssize ...@@ -605,7 +605,7 @@ static int __Pyx_PyBytes_SingleTailmatch(PyObject* self, PyObject* arg, Py_ssize
} }
if (start + sub_len <= end) if (start + sub_len <= end)
retval = !memcmp(self_ptr+start, sub_ptr, sub_len); retval = !memcmp(self_ptr+start, sub_ptr, (size_t)sub_len);
else else
retval = 0; retval = 0;
......
...@@ -43,7 +43,7 @@ static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u) ...@@ -43,7 +43,7 @@ static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u)
{ {
const Py_UNICODE *u_end = u; const Py_UNICODE *u_end = u;
while (*u_end++) ; while (*u_end++) ;
return u_end - u - 1; return (size_t)(u_end - u - 1);
} }
#else #else
#define __Pyx_Py_UNICODE_strlen Py_UNICODE_strlen #define __Pyx_Py_UNICODE_strlen Py_UNICODE_strlen
...@@ -151,7 +151,7 @@ bad: ...@@ -151,7 +151,7 @@ bad:
/* Type Conversion Functions */ /* Type Conversion Functions */
static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char* c_str) { static CYTHON_INLINE PyObject* __Pyx_PyUnicode_FromString(const char* c_str) {
return __Pyx_PyUnicode_FromStringAndSize(c_str, strlen(c_str)); return __Pyx_PyUnicode_FromStringAndSize(c_str, (Py_ssize_t)strlen(c_str));
} }
static CYTHON_INLINE char* __Pyx_PyObject_AsString(PyObject* o) { static CYTHON_INLINE char* __Pyx_PyObject_AsString(PyObject* o) {
......
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