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/Operation.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/Operation.cpp')
| -rw-r--r-- | python/modules/IcePy/Operation.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/modules/IcePy/Operation.cpp b/python/modules/IcePy/Operation.cpp index f4bcd8256cc..d343d244c2a 100644 --- a/python/modules/IcePy/Operation.cpp +++ b/python/modules/IcePy/Operation.cpp @@ -3189,7 +3189,7 @@ IcePy::SyncBlobjectInvocation::invoke(PyObject* args, PyObject* /* kwds */) } else { - op = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(&out[0]), out.size()); + op = PyBytes_FromStringAndSize(reinterpret_cast<const char*>(&out[0]), static_cast<Py_ssize_t>(out.size())); } if(!op.get()) { |