diff options
Diffstat (limited to 'TAO/tao/PortableInterceptorC.cpp')
| -rw-r--r-- | TAO/tao/PortableInterceptorC.cpp | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/TAO/tao/PortableInterceptorC.cpp b/TAO/tao/PortableInterceptorC.cpp index 13538cdf8a3..4a9f05edc20 100644 --- a/TAO/tao/PortableInterceptorC.cpp +++ b/TAO/tao/PortableInterceptorC.cpp @@ -88,7 +88,7 @@ void *PortableInterceptor::Interceptor::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -162,7 +162,7 @@ void PortableInterceptor::ForwardRequest::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -175,7 +175,7 @@ void PortableInterceptor::ForwardRequest::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -335,7 +335,7 @@ void PortableInterceptor::InvalidSlot::_tao_encode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -348,7 +348,7 @@ void PortableInterceptor::InvalidSlot::_tao_decode ( { return; } - + ACE_THROW (CORBA::MARSHAL ()); } @@ -449,7 +449,7 @@ void *PortableInterceptor::Current::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -518,7 +518,7 @@ void *PortableInterceptor::RequestInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -599,7 +599,7 @@ void *PortableInterceptor::ClientRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -680,7 +680,7 @@ void *PortableInterceptor::ServerRequestInfo::_tao_QueryInterface (ptr_arith_t t else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -761,7 +761,7 @@ void *PortableInterceptor::ClientRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -842,7 +842,7 @@ void *PortableInterceptor::ServerRequestInterceptor::_tao_QueryInterface (ptr_ar else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -911,7 +911,7 @@ void *PortableInterceptor::IORInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -992,7 +992,7 @@ void *PortableInterceptor::IORInterceptor::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1061,7 +1061,7 @@ void *PortableInterceptor::PolicyFactory::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1130,7 +1130,7 @@ void *PortableInterceptor::ORBInitInfo::_tao_QueryInterface (ptr_arith_t type) else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1345,7 +1345,7 @@ void *PortableInterceptor::ORBInitializer::_tao_QueryInterface (ptr_arith_t type else if (type == ACE_reinterpret_cast (ptr_arith_t, &CORBA::Object::_narrow)) retv = ACE_reinterpret_cast (void *, ACE_static_cast (CORBA::Object_ptr, this)); - + if (retv) this->_add_ref (); return retv; @@ -1402,15 +1402,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = - type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) + if (!type->equivalent (PortableInterceptor::_tc_ForwardRequest, ACE_TRY_ENV)) // not equal { return 0; } - + ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { _tao_elem = (PortableInterceptor::ForwardRequest *)_tao_any.value (); @@ -1494,15 +1490,11 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto ACE_TRY_NEW_ENV { CORBA::TypeCode_var type = _tao_any.type (); - CORBA::Boolean result = - type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV); - ACE_TRY_CHECK; - - if (!result) + if (!type->equivalent (PortableInterceptor::_tc_InvalidSlot, ACE_TRY_ENV)) // not equal { return 0; } - + ACE_TRY_CHECK; if (_tao_any.any_owns_data ()) { _tao_elem = (PortableInterceptor::InvalidSlot *)_tao_any.value (); @@ -1623,3 +1615,4 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, const PortableIntercepto #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) # pragma instantiate TAO_Object_Manager<PortableInterceptor::ORBInitializer,PortableInterceptor::ORBInitializer_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ + |