summaryrefslogtreecommitdiff
path: root/py/python/Ice.py
diff options
context:
space:
mode:
authorMark Spruiell <mes@zeroc.com>2004-09-14 13:53:04 +0000
committerMark Spruiell <mes@zeroc.com>2004-09-14 13:53:04 +0000
commitd62f51d71ff7a4b9fd09ecb90dd669fb310575f9 (patch)
tree3801d18e763400729a34b601fd19555eb262507a /py/python/Ice.py
parentnew scheme for type definitions; adding AMD support; fixed locking issues (diff)
downloadice-d62f51d71ff7a4b9fd09ecb90dd669fb310575f9.tar.bz2
ice-d62f51d71ff7a4b9fd09ecb90dd669fb310575f9.tar.xz
ice-d62f51d71ff7a4b9fd09ecb90dd669fb310575f9.zip
new scheme for type definitions
Diffstat (limited to 'py/python/Ice.py')
-rw-r--r--py/python/Ice.py18
1 files changed, 9 insertions, 9 deletions
diff --git a/py/python/Ice.py b/py/python/Ice.py
index 6149aa898a5..65430131bbb 100644
--- a/py/python/Ice.py
+++ b/py/python/Ice.py
@@ -94,8 +94,8 @@ def createTempClass():
#
# Forward declarations.
#
-IcePy.declareClass('::Ice::Object')
-IcePy.declareProxy('::Ice::Object')
+IcePy._t_Object = IcePy.declareClass('::Ice::Object')
+IcePy._t_ObjectPrx = IcePy.declareProxy('::Ice::Object')
#
# Import Ice types.
@@ -117,13 +117,13 @@ import ApplicationImpl
#
# Define Ice::Object and Ice::ObjectPrx.
#
-IcePy.defineClass('::Ice::Object', Object, False, '', (), ())
-IcePy.defineProxy('::Ice::Object', ObjectPrx)
+IcePy._t_Object = IcePy.defineClass('::Ice::Object', Object, False, None, (), ())
+IcePy._t_ObjectPrx = IcePy.defineProxy('::Ice::Object', ObjectPrx)
-Object._op_ice_isA = IcePy.Operation('ice_isA', OperationMode.Nonmutating, (IcePy.T_STRING,), (), IcePy.T_BOOL, ())
-Object._op_ice_ping = IcePy.Operation('ice_ping', OperationMode.Nonmutating, (), (), None, ())
-Object._op_ice_ids = IcePy.Operation('ice_ids', OperationMode.Nonmutating, (), (), '::Ice::StringSeq', ())
-Object._op_ice_id = IcePy.Operation('ice_id', OperationMode.Nonmutating, (), (), IcePy.T_STRING, ())
+Object._op_ice_isA = IcePy.Operation('ice_isA', OperationMode.Nonmutating, False, (IcePy._t_string,), (), IcePy._t_bool, ())
+Object._op_ice_ping = IcePy.Operation('ice_ping', OperationMode.Nonmutating, False, (), (), None, ())
+Object._op_ice_ids = IcePy.Operation('ice_ids', OperationMode.Nonmutating, False, (), (), _t_StringSeq, ())
+Object._op_ice_id = IcePy.Operation('ice_id', OperationMode.Nonmutating, False, (), (), IcePy._t_string, ())
#
# Annotate Ice::Identity.
@@ -134,7 +134,7 @@ Identity.__str__ = Identity__str__
del Identity__str__
def Identity__hash__(self):
- return 5 * hash(self.category) + hash(self.name)
+ return (5 * hash(self.category) + hash(self.name)) % 0x7fffffff
Identity.__hash__ = Identity__hash__
del Identity__hash__