diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/include/Ice/Proxy.h | 8 | ||||
| -rw-r--r-- | cpp/src/Ice/Proxy.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h index b6908be7823..a0ccbb4d0d2 100644 --- a/cpp/include/Ice/Proxy.h +++ b/cpp/include/Ice/Proxy.h @@ -334,19 +334,19 @@ uncheckedCastImpl(const ::Ice::ObjectPrx& b) // such as VC7. // -ICE_API ::Ice::ObjectPrx checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&); -ICE_API ::Ice::ObjectPrx uncheckedCastImpl(const ::Ice::ObjectPrx&, const std::string&); +ICE_API ::Ice::ObjectPrx trivialCheckedCastImpl(const ::Ice::ObjectPrx&, const std::string&); +ICE_API ::Ice::ObjectPrx trivialUncheckedCastImpl(const ::Ice::ObjectPrx&, const std::string&); template<> inline ::Ice::ObjectPrx checkedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f) { - return checkedCastImpl(b, f); + return trivialCheckedCastImpl(b, f); } template<> inline ::Ice::ObjectPrx uncheckedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f) { - return uncheckedCastImpl(b, f); + return trivialUncheckedCastImpl(b, f); } template<typename P> P diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp index bc42eb67ef8..6bb721d127c 100644 --- a/cpp/src/Ice/Proxy.cpp +++ b/cpp/src/Ice/Proxy.cpp @@ -45,7 +45,7 @@ void IceInternal::decRef(::IceDelegateD::Ice::Object* p) { p->__decRef(); } ::Ice::ObjectPrx -IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f) +IceInternal::trivialCheckedCastImpl(const ObjectPrx& b, const string& f) { ObjectPrx d = 0; if(b) @@ -69,7 +69,7 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f) } ::Ice::ObjectPrx -IceInternal::uncheckedCastImpl(const ObjectPrx& b, const string& f) +IceInternal::trivialUncheckedCastImpl(const ObjectPrx& b, const string& f) { ObjectPrx d = 0; if(b) |