diff options
author | Mark Spruiell <mes@zeroc.com> | 2009-06-25 09:41:49 -0700 |
---|---|---|
committer | Mark Spruiell <mes@zeroc.com> | 2009-06-25 09:41:49 -0700 |
commit | e5b38b6bea1556fc3792d88cb1fd4a31e247cb16 (patch) | |
tree | b280a35e5876932121ac8b4a8a5783604ff528ec /php/lib | |
parent | fixing Windows compilation bug in defaultServant test (diff) | |
download | ice-e5b38b6bea1556fc3792d88cb1fd4a31e247cb16.tar.bz2 ice-e5b38b6bea1556fc3792d88cb1fd4a31e247cb16.tar.xz ice-e5b38b6bea1556fc3792d88cb1fd4a31e247cb16.zip |
PHP fixes:
- adding namespace support to test suite and demos
- doc edits
- bug fix in translator
Diffstat (limited to 'php/lib')
-rw-r--r-- | php/lib/Ice_ns.php | 27 |
1 files changed, 25 insertions, 2 deletions
diff --git a/php/lib/Ice_ns.php b/php/lib/Ice_ns.php index 12c4d3159fd..138bb4efa10 100644 --- a/php/lib/Ice_ns.php +++ b/php/lib/Ice_ns.php @@ -75,9 +75,9 @@ namespace Ice } } - $Ice__t_Object = IcePHP_defineClass('::Ice::Object', "Ice\\Object", true, null, null, null); + $Ice__t_Object = IcePHP_defineClass('::Ice::Object', "\\Ice\\Object", true, null, null, null); $Ice__t_ObjectSeq = IcePHP_defineSequence('::Ice::ObjectSeq', $Ice__t_Object, true, 4); - $Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "Ice\\LocalObject", true, null, null, null); + $Ice__t_LocalObject = IcePHP_defineClass('::Ice::LocalObject', "\\Ice\\LocalObject", true, null, null, null); $Ice__t_ObjectPrx = IcePHP_defineProxy($Ice__t_Object); $Ice__t_ObjectProxySeq = IcePHP_defineSequence('::Ice::ObjectProxySeq', $Ice__t_ObjectPrx, true, 2); @@ -183,4 +183,27 @@ namespace Ice return proxyIdentityAndFacetCompare($lhs, $rhs) == 0; } } + +namespace +{ + function Ice_proxyIdentityCompare($lhs, $rhs) + { + return Ice\proxyIdentityCompare($lhs, $rhs); + } + + function Ice_proxyIdentityEqual($lhs, $rhs) + { + return Ice\proxyIdentityEqual($lhs, $rhs); + } + + function Ice_proxyIdentityAndFacetCompare($lhs, $rhs) + { + return Ice\proxyIdentityAndFacetCompare($lhs, $rhs); + } + + function Ice_proxyIdentityAndFacetEqual($lhs, $rhs) + { + return Ice\proxyIdentityAndFacetEqual($lhs, $rhs); + } +} ?> |