diff options
| author | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-07-18 23:51:08 +0200 |
| commit | fc886b010c01cccb8cca3ac4d92f1ebd7fc72295 (patch) | |
| tree | 51cf00a4a955efecc9c94527aeafcb25ffbe57b9 /python/modules/IcePy/Util.cpp | |
| parent | Simplify OutputStream creation (diff) | |
| parent | Fixed non-thread safe AMD dispatch, fixes #448 (#449) (diff) | |
| download | ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.bz2 ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.tar.xz ice-fc886b010c01cccb8cca3ac4d92f1ebd7fc72295.zip | |
Merge remote-tracking branch 'origin/3.7' into swift
Diffstat (limited to 'python/modules/IcePy/Util.cpp')
| -rw-r--r-- | python/modules/IcePy/Util.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/modules/IcePy/Util.cpp b/python/modules/IcePy/Util.cpp index 6a17e0e4c1d..f15c7a5c690 100644 --- a/python/modules/IcePy/Util.cpp +++ b/python/modules/IcePy/Util.cpp @@ -174,7 +174,7 @@ IcePy::getString(PyObject* p) char* s; Py_ssize_t sz; PyBytes_AsStringAndSize(bytes.get(), &s, &sz); - str.assign(s, sz); + str.assign(s, static_cast<size_t>(sz)); } #else str.assign(PyString_AS_STRING(p), static_cast<size_t>(PyString_GET_SIZE(p))); |