diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-03-31 08:38:29 +0200 |
| commit | 04c83affba981565fcca3b3bfa2a3d96ca331c81 (patch) | |
| tree | 8cf749969ff9209645130bb8e4433d837c77c6d6 /python/modules/IcePy/Current.cpp | |
| parent | Merge remote-tracking branch 'origin/3.6' (diff) | |
| parent | Fixed Glacier2 bug which would cause hang on shutdown (diff) | |
| download | ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.bz2 ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.tar.xz ice-04c83affba981565fcca3b3bfa2a3d96ca331c81.zip | |
Merge remote-tracking branch 'origin/3.6'
Diffstat (limited to 'python/modules/IcePy/Current.cpp')
| -rw-r--r-- | python/modules/IcePy/Current.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/modules/IcePy/Current.cpp b/python/modules/IcePy/Current.cpp index 9832d1913a6..7afb2461dd4 100644 --- a/python/modules/IcePy/Current.cpp +++ b/python/modules/IcePy/Current.cpp @@ -113,7 +113,7 @@ currentGetter(CurrentObject* self, void* closure) assert(self->current); - long field = reinterpret_cast<long>(closure); + Py_ssize_t field = reinterpret_cast<Py_ssize_t>(closure); switch(field) { case CURRENT_ADAPTER: |