summaryrefslogtreecommitdiff
path: root/python/modules/IcePy/Proxy.cpp
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
committerBernard Normier <bernard@zeroc.com>2016-11-05 10:51:56 -0400
commita9207c4a7e8190cb64286afc1b373f16010d0feb (patch)
treeb6815a6debc9b9589145cc12f192b6dd83b3f49e /python/modules/IcePy/Proxy.cpp
parentRevert "Reverted previous double-underscore changes in IceUtil classes" (diff)
downloadice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.bz2
ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.tar.xz
ice-a9207c4a7e8190cb64286afc1b373f16010d0feb.zip
Revert "Replaced double and triple underscores in C++ by ice-prefixed names"
This reverts commit 91fa99c34d1211d426b24bf68001fc27a87b3f00.
Diffstat (limited to 'python/modules/IcePy/Proxy.cpp')
-rw-r--r--python/modules/IcePy/Proxy.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/python/modules/IcePy/Proxy.cpp b/python/modules/IcePy/Proxy.cpp
index b02106e5f68..d9b2704b2a8 100644
--- a/python/modules/IcePy/Proxy.cpp
+++ b/python/modules/IcePy/Proxy.cpp
@@ -164,7 +164,7 @@ extern "C"
static long
proxyHash(ProxyObject* self)
{
- return static_cast<long>((*self->proxy)->iceHash());
+ return static_cast<long>((*self->proxy)->__hash());
}
#ifdef WIN32