diff options
| author | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-22 00:29:53 +0200 |
| commit | c5959fd09de61604bedd75354401df6a57395d65 (patch) | |
| tree | 3b0227f631c8b20fb1a1a274b92f63f52f34af2c /python/modules/IcePy/Util.cpp | |
| parent | Small fix (diff) | |
| parent | Enable -Wconversion with clang - Close #363 (diff) | |
| download | ice-c5959fd09de61604bedd75354401df6a57395d65.tar.bz2 ice-c5959fd09de61604bedd75354401df6a57395d65.tar.xz ice-c5959fd09de61604bedd75354401df6a57395d65.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 30c2a877223..6a17e0e4c1d 100644 --- a/python/modules/IcePy/Util.cpp +++ b/python/modules/IcePy/Util.cpp @@ -177,7 +177,7 @@ IcePy::getString(PyObject* p) str.assign(s, sz); } #else - str.assign(PyString_AS_STRING(p), PyString_GET_SIZE(p)); + str.assign(PyString_AS_STRING(p), static_cast<size_t>(PyString_GET_SIZE(p))); #endif } return str; |