diff options
author | Lisandro Dalcin <dalcinl@gmail.com> | 2014-05-04 23:58:21 +0300 |
---|---|---|
committer | Lisandro Dalcin <dalcinl@gmail.com> | 2014-05-04 23:58:21 +0300 |
commit | 9d8f23ec62f5941688ead77861cd94af8889c269 (patch) | |
tree | bbd97d7a55530ed76eb99b4a99dfff4c5354a245 /Cython | |
parent | 6b5856abfa3aa621f487123e64376cada3418294 (diff) | |
download | cython-9d8f23ec62f5941688ead77861cd94af8889c269.tar.gz |
Silent clang -Wconversion warnings
Diffstat (limited to 'Cython')
-rw-r--r-- | Cython/Utility/ModuleSetupCode.c | 2 | ||||
-rw-r--r-- | Cython/Utility/Optimize.c | 2 | ||||
-rw-r--r-- | Cython/Utility/StringTools.c | 4 | ||||
-rw-r--r-- | Cython/Utility/TypeConversion.c | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/Cython/Utility/ModuleSetupCode.c b/Cython/Utility/ModuleSetupCode.c index fc8a63ffa..789a890c3 100644 --- a/Cython/Utility/ModuleSetupCode.c +++ b/Cython/Utility/ModuleSetupCode.c @@ -464,7 +464,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) { if (__pyx_code_cache.count == __pyx_code_cache.max_count) { int new_max = __pyx_code_cache.max_count + 64; 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)) { return; } diff --git a/Cython/Utility/Optimize.c b/Cython/Utility/Optimize.c index 4bd70df9d..a6a776e67 100644 --- a/Cython/Utility/Optimize.c +++ b/Cython/Utility/Optimize.c @@ -140,7 +140,7 @@ static PyObject* __Pyx_PyList_PopIndex(PyObject* L, Py_ssize_t ix) { PyObject* v = PyList_GET_ITEM(L, cix); Py_SIZE(L) -= 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; } } diff --git a/Cython/Utility/StringTools.c b/Cython/Utility/StringTools.c index 38f20db4e..4ae6cefed 100644 --- a/Cython/Utility/StringTools.c +++ b/Cython/Utility/StringTools.c @@ -190,7 +190,7 @@ static CYTHON_INLINE int __Pyx_PyUnicode_Equals(PyObject* s1, PyObject* s2, int } else if (length == 1) { goto return_eq; } else { - int result = memcmp(data1, data2, length * kind); + int result = memcmp(data1, data2, (size_t)(length * kind)); #if PY_MAJOR_VERSION < 3 Py_XDECREF(owned_ref); #endif @@ -612,7 +612,7 @@ static int __Pyx_PyBytes_SingleTailmatch(PyObject* self, PyObject* arg, Py_ssize } 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 retval = 0; diff --git a/Cython/Utility/TypeConversion.c b/Cython/Utility/TypeConversion.c index 4ebb5ee03..63421db1a 100644 --- a/Cython/Utility/TypeConversion.c +++ b/Cython/Utility/TypeConversion.c @@ -43,7 +43,7 @@ static CYTHON_INLINE size_t __Pyx_Py_UNICODE_strlen(const Py_UNICODE *u) { const Py_UNICODE *u_end = u; while (*u_end++) ; - return u_end - u - 1; + return (size_t)(u_end - u - 1); } #else #define __Pyx_Py_UNICODE_strlen Py_UNICODE_strlen @@ -151,7 +151,7 @@ bad: /* Type Conversion Functions */ 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) { |