diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2006-03-28 14:03:50 +0000 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2006-03-28 14:03:50 +0000 |
| commit | 3edb9d1e2ca92fff1bea08d23338cabee47dd2e7 (patch) | |
| tree | b62a1dc465ac160616672c6a64f630396e4fae05 /cppe/src | |
| parent | Synced with Ice for C++ changes. (diff) | |
| download | ice-3edb9d1e2ca92fff1bea08d23338cabee47dd2e7.tar.bz2 ice-3edb9d1e2ca92fff1bea08d23338cabee47dd2e7.tar.xz ice-3edb9d1e2ca92fff1bea08d23338cabee47dd2e7.zip | |
Fixed half of bug 847: ice_newIdentiy -> ice_identity, ice_newFacet ->
ice_facet, etc
Diffstat (limited to 'cppe/src')
| -rw-r--r-- | cppe/src/IceE/Proxy.cpp | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp index 7a271ec9e8d..9ae070e8d79 100644 --- a/cppe/src/IceE/Proxy.cpp +++ b/cppe/src/IceE/Proxy.cpp @@ -65,7 +65,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& if(b) { - ObjectPrx bb = b->ice_newFacet(f); + ObjectPrx bb = b->ice_facet(f); try { if(bb->ice_isA(typeId)) @@ -99,7 +99,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& if(b) { - ObjectPrx bb = b->ice_newFacet(f); + ObjectPrx bb = b->ice_facet(f); try { if(bb->ice_isA(typeId, ctx)) @@ -428,7 +428,7 @@ IceProxy::Ice::Object::ice_getContext() const } ObjectPrx -IceProxy::Ice::Object::ice_newContext(const Context& newContext) const +IceProxy::Ice::Object::ice_context(const Context& newContext) const { ObjectPrx proxy(new ::IceProxy::Ice::Object()); proxy->setup(_reference->changeContext(newContext)); @@ -436,6 +436,12 @@ IceProxy::Ice::Object::ice_newContext(const Context& newContext) const } ObjectPrx +IceProxy::Ice::Object::ice_newContext(const Context& newContext) const +{ + return ice_context(newContext); +} + +ObjectPrx IceProxy::Ice::Object::ice_defaultContext() const { ObjectPrx proxy(new ::IceProxy::Ice::Object()); @@ -450,7 +456,7 @@ IceProxy::Ice::Object::ice_getIdentity() const } ObjectPrx -IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const +IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const { if(newIdentity == _reference->getIdentity()) { @@ -464,6 +470,12 @@ IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const } } +ObjectPrx +IceProxy::Ice::Object::ice_newIdentity(const Identity& newIdentity) const +{ + return ice_identity(newIdentity); +} + const string& IceProxy::Ice::Object::ice_getFacet() const { @@ -471,7 +483,7 @@ IceProxy::Ice::Object::ice_getFacet() const } ObjectPrx -IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const +IceProxy::Ice::Object::ice_facet(const string& newFacet) const { if(newFacet == _reference->getFacet()) { @@ -486,6 +498,12 @@ IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const } ObjectPrx +IceProxy::Ice::Object::ice_newFacet(const string& newFacet) const +{ + return ice_facet(newFacet); +} + +ObjectPrx IceProxy::Ice::Object::ice_twoway() const { ReferencePtr ref = _reference->changeMode(Reference::ModeTwoway); |