diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2005-09-08 07:26:18 +0000 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2005-09-08 07:26:18 +0000 |
| commit | 5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c (patch) | |
| tree | da30228a4ed4468ee10db027590ba9a10a3e4e5d /cpp/src/Ice/Proxy.cpp | |
| parent | fix build problem. (diff) | |
| download | ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.tar.bz2 ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.tar.xz ice-5b9b0d512c8d0ccc4c0e480b802fa841f38fd55c.zip | |
http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=460
Diffstat (limited to 'cpp/src/Ice/Proxy.cpp')
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 26 |
1 files changed, 6 insertions, 20 deletions
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index e9b70364262..11e8e6077dc 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -333,31 +333,17 @@ IceProxy::Ice::Object::ice_getContext() const ObjectPrx IceProxy::Ice::Object::ice_newContext(const Context& newContext) const { - if(_reference->hasContext() && newContext == _reference->getContext()) - { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); - } - else - { - ObjectPrx proxy(new ::IceProxy::Ice::Object()); - proxy->setup(_reference->changeContext(newContext)); - return proxy; - } + ObjectPrx proxy(new ::IceProxy::Ice::Object()); + proxy->setup(_reference->changeContext(newContext)); + return proxy; } ObjectPrx IceProxy::Ice::Object::ice_defaultContext() const { - if(!_reference->hasContext()) - { - return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this)); - } - else - { - ObjectPrx proxy(new ::IceProxy::Ice::Object()); - proxy->setup(_reference->defaultContext()); - return proxy; - } + ObjectPrx proxy(new ::IceProxy::Ice::Object()); + proxy->setup(_reference->defaultContext()); + return proxy; } Identity |