summaryrefslogtreecommitdiff
path: root/cpp
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2015-12-21 14:07:52 -0500
committerJoe George <joe@zeroc.com>2015-12-21 14:37:06 -0500
commit8a30bd797a276b4adf5abb5ab0ef0ec33cfface3 (patch)
treee3ff707a40a4f533c80b2bd7f4a799f14ba527cc /cpp
parentAdd missing Ice/VirtualShared.h (diff)
downloadice-8a30bd797a276b4adf5abb5ab0ef0ec33cfface3.tar.bz2
ice-8a30bd797a276b4adf5abb5ab0ef0ec33cfface3.tar.xz
ice-8a30bd797a276b4adf5abb5ab0ef0ec33cfface3.zip
ICE-6909 - Remove C++98 checkedCast optimization
Diffstat (limited to 'cpp')
-rw-r--r--cpp/include/Ice/Proxy.h5
1 files changed, 1 insertions, 4 deletions
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 688171da5d3..4efa4013a15 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -1511,10 +1511,7 @@ checkedCastImpl(const ::Ice::ObjectPrxPtr& b, const ::Ice::Context* context)
{
typedef typename P::element_type T;
- d = dynamic_cast<T*>(b.get());
- if(!d && (context == 0 ?
- b->ice_isA(T::ice_staticId()) :
- b->ice_isA(T::ice_staticId(), *context)))
+ if(context == 0 ? b->ice_isA(T::ice_staticId()) : b->ice_isA(T::ice_staticId(), *context))
{
d = new T;
d->__copyFrom(b);