diff options
Diffstat (limited to 'TAO/tao/MessagingC.cpp')
| -rw-r--r-- | TAO/tao/MessagingC.cpp | 309 |
1 files changed, 56 insertions, 253 deletions
diff --git a/TAO/tao/MessagingC.cpp b/TAO/tao/MessagingC.cpp index 1a6b3adbf4f..c079033d2b4 100644 --- a/TAO/tao/MessagingC.cpp +++ b/TAO/tao/MessagingC.cpp @@ -196,21 +196,10 @@ Messaging::RebindPolicy_ptr Messaging::RebindPolicy::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:Messaging/RebindPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RebindPolicy::_nil ()); - - Messaging::RebindPolicy_ptr retval = - Messaging::RebindPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RebindPolicy ( - ACE_reinterpret_cast (POA_Messaging::RebindPolicy_ptr, - servant), - stub - ), - Messaging::RebindPolicy::_nil () + return new POA_Messaging::_tao_collocated_RebindPolicy( + ACE_reinterpret_cast(POA_Messaging::RebindPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RebindPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -274,21 +263,10 @@ Messaging::SyncScopePolicy_ptr Messaging::SyncScopePolicy::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:Messaging/SyncScopePolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::SyncScopePolicy::_nil ()); - - Messaging::SyncScopePolicy_ptr retval = - Messaging::SyncScopePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_SyncScopePolicy ( - ACE_reinterpret_cast (POA_Messaging::SyncScopePolicy_ptr, - servant), - stub - ), - Messaging::SyncScopePolicy::_nil () + return new POA_Messaging::_tao_collocated_SyncScopePolicy( + ACE_reinterpret_cast(POA_Messaging::SyncScopePolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::SyncScopePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -380,21 +358,10 @@ Messaging::RequestPriorityPolicy_ptr Messaging::RequestPriorityPolicy::_unchecke servant = obj->_servant()->_downcast ("IDL:Messaging/RequestPriorityPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestPriorityPolicy::_nil ()); - - Messaging::RequestPriorityPolicy_ptr retval = - Messaging::RequestPriorityPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestPriorityPolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestPriorityPolicy_ptr, - servant), - stub - ), - Messaging::RequestPriorityPolicy::_nil () + return new POA_Messaging::_tao_collocated_RequestPriorityPolicy( + ACE_reinterpret_cast(POA_Messaging::RequestPriorityPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RequestPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -458,21 +425,10 @@ Messaging::ReplyPriorityPolicy_ptr Messaging::ReplyPriorityPolicy::_unchecked_na servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyPriorityPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyPriorityPolicy::_nil ()); - - Messaging::ReplyPriorityPolicy_ptr retval = - Messaging::ReplyPriorityPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyPriorityPolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyPriorityPolicy_ptr, - servant), - stub - ), - Messaging::ReplyPriorityPolicy::_nil () + return new POA_Messaging::_tao_collocated_ReplyPriorityPolicy( + ACE_reinterpret_cast(POA_Messaging::ReplyPriorityPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::ReplyPriorityPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -536,21 +492,10 @@ Messaging::RequestStartTimePolicy_ptr Messaging::RequestStartTimePolicy::_unchec servant = obj->_servant()->_downcast ("IDL:Messaging/RequestStartTimePolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestStartTimePolicy::_nil ()); - - Messaging::RequestStartTimePolicy_ptr retval = - Messaging::RequestStartTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestStartTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestStartTimePolicy_ptr, - servant), - stub - ), - Messaging::RequestStartTimePolicy::_nil () + return new POA_Messaging::_tao_collocated_RequestStartTimePolicy( + ACE_reinterpret_cast(POA_Messaging::RequestStartTimePolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RequestStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -614,21 +559,10 @@ Messaging::RequestEndTimePolicy_ptr Messaging::RequestEndTimePolicy::_unchecked_ servant = obj->_servant()->_downcast ("IDL:Messaging/RequestEndTimePolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RequestEndTimePolicy::_nil ()); - - Messaging::RequestEndTimePolicy_ptr retval = - Messaging::RequestEndTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RequestEndTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::RequestEndTimePolicy_ptr, - servant), - stub - ), - Messaging::RequestEndTimePolicy::_nil () + return new POA_Messaging::_tao_collocated_RequestEndTimePolicy( + ACE_reinterpret_cast(POA_Messaging::RequestEndTimePolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RequestEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -692,21 +626,10 @@ Messaging::ReplyStartTimePolicy_ptr Messaging::ReplyStartTimePolicy::_unchecked_ servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyStartTimePolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyStartTimePolicy::_nil ()); - - Messaging::ReplyStartTimePolicy_ptr retval = - Messaging::ReplyStartTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyStartTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyStartTimePolicy_ptr, - servant), - stub - ), - Messaging::ReplyStartTimePolicy::_nil () + return new POA_Messaging::_tao_collocated_ReplyStartTimePolicy( + ACE_reinterpret_cast(POA_Messaging::ReplyStartTimePolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::ReplyStartTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -770,21 +693,10 @@ Messaging::ReplyEndTimePolicy_ptr Messaging::ReplyEndTimePolicy::_unchecked_narr servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyEndTimePolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::ReplyEndTimePolicy::_nil ()); - - Messaging::ReplyEndTimePolicy_ptr retval = - Messaging::ReplyEndTimePolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyEndTimePolicy ( - ACE_reinterpret_cast (POA_Messaging::ReplyEndTimePolicy_ptr, - servant), - stub - ), - Messaging::ReplyEndTimePolicy::_nil () + return new POA_Messaging::_tao_collocated_ReplyEndTimePolicy( + ACE_reinterpret_cast(POA_Messaging::ReplyEndTimePolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::ReplyEndTimePolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -848,21 +760,10 @@ Messaging::RelativeRequestTimeoutPolicy_ptr Messaging::RelativeRequestTimeoutPol servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRequestTimeoutPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRequestTimeoutPolicy::_nil ()); - - Messaging::RelativeRequestTimeoutPolicy_ptr retval = - Messaging::RelativeRequestTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy ( - ACE_reinterpret_cast (POA_Messaging::RelativeRequestTimeoutPolicy_ptr, - servant), - stub - ), - Messaging::RelativeRequestTimeoutPolicy::_nil () + return new POA_Messaging::_tao_collocated_RelativeRequestTimeoutPolicy( + ACE_reinterpret_cast(POA_Messaging::RelativeRequestTimeoutPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RelativeRequestTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -927,21 +828,10 @@ Messaging::RelativeRoundtripTimeoutPolicy_ptr Messaging::RelativeRoundtripTimeou servant = obj->_servant()->_downcast ("IDL:Messaging/RelativeRoundtripTimeoutPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RelativeRoundtripTimeoutPolicy::_nil ()); - - Messaging::RelativeRoundtripTimeoutPolicy_ptr retval = - Messaging::RelativeRoundtripTimeoutPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy ( - ACE_reinterpret_cast (POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, - servant), - stub - ), - Messaging::RelativeRoundtripTimeoutPolicy::_nil () + return new POA_Messaging::_tao_collocated_RelativeRoundtripTimeoutPolicy( + ACE_reinterpret_cast(POA_Messaging::RelativeRoundtripTimeoutPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RelativeRoundtripTimeoutPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1033,21 +923,10 @@ Messaging::RoutingPolicy_ptr Messaging::RoutingPolicy::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:Messaging/RoutingPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::RoutingPolicy::_nil ()); - - Messaging::RoutingPolicy_ptr retval = - Messaging::RoutingPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_RoutingPolicy ( - ACE_reinterpret_cast (POA_Messaging::RoutingPolicy_ptr, - servant), - stub - ), - Messaging::RoutingPolicy::_nil () + return new POA_Messaging::_tao_collocated_RoutingPolicy( + ACE_reinterpret_cast(POA_Messaging::RoutingPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::RoutingPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1111,21 +990,10 @@ Messaging::MaxHopsPolicy_ptr Messaging::MaxHopsPolicy::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:Messaging/MaxHopsPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::MaxHopsPolicy::_nil ()); - - Messaging::MaxHopsPolicy_ptr retval = - Messaging::MaxHopsPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_MaxHopsPolicy ( - ACE_reinterpret_cast (POA_Messaging::MaxHopsPolicy_ptr, - servant), - stub - ), - Messaging::MaxHopsPolicy::_nil () + return new POA_Messaging::_tao_collocated_MaxHopsPolicy( + ACE_reinterpret_cast(POA_Messaging::MaxHopsPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::MaxHopsPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1189,21 +1057,10 @@ Messaging::QueueOrderPolicy_ptr Messaging::QueueOrderPolicy::_unchecked_narrow ( servant = obj->_servant()->_downcast ("IDL:Messaging/QueueOrderPolicy:1.0"); if (servant == 0) ACE_THROW_RETURN (CORBA::MARSHAL (), Messaging::QueueOrderPolicy::_nil ()); - - Messaging::QueueOrderPolicy_ptr retval = - Messaging::QueueOrderPolicy::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_QueueOrderPolicy ( - ACE_reinterpret_cast (POA_Messaging::QueueOrderPolicy_ptr, - servant), - stub - ), - Messaging::QueueOrderPolicy::_nil () + return new POA_Messaging::_tao_collocated_QueueOrderPolicy( + ACE_reinterpret_cast(POA_Messaging::QueueOrderPolicy_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::QueueOrderPolicy::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1360,8 +1217,7 @@ TAO_NAMESPACE_END // **************************************************************** -#if defined (TAO_HAS_AMI_POLLER) - +#if defined(TAO_POLLER) static const CORBA::Long _oc_Messaging_ExceptionHolder[] = { TAO_ENCAP_BYTE_ORDER, // byte order @@ -1414,15 +1270,10 @@ static const CORBA::Long _oc_Messaging_ExceptionHolder__tao_seq_Octet[] = 0, }; static CORBA::TypeCode _tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet (CORBA::tk_sequence, sizeof (_oc_Messaging_ExceptionHolder__tao_seq_Octet), (char *) &_oc_Messaging_ExceptionHolder__tao_seq_Octet, 0, sizeof (Messaging::ExceptionHolder::_tao_seq_Octet)); - CORBA::TypeCode_ptr Messaging::ExceptionHolder::_tc__tao_seq_Octet = &_tc_TAO_tc_Messaging_ExceptionHolder__tao_seq_Octet; -#endif /* TAO_HAS_AMI_POLLER */ - // **************************************************************** -#if defined(TAO_HAS_AMI_CALLBACK) - Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_narrow ( CORBA::Object_ptr obj, CORBA::Environment &ACE_TRY_ENV @@ -1451,31 +1302,11 @@ Messaging::ReplyHandler_ptr Messaging::ReplyHandler::_unchecked_narrow ( if (obj->_is_collocated () && obj->_servant() != 0) servant = obj->_servant()->_downcast ("IDL:Messaging/ReplyHandler:1.0"); if (servant == 0) - { - Messaging::ReplyHandler_ptr rval = - Messaging::ReplyHandler::_nil (); - - ACE_NEW_RETURN (rval, - Messaging::ReplyHandler (stub), - Messaging::ReplyHandler::_nil ()); - - return rval; - } - - Messaging::ReplyHandler_ptr retval = - Messaging::ReplyHandler::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_ReplyHandler ( - ACE_reinterpret_cast (POA_Messaging::ReplyHandler_ptr, - servant), - stub - ), - Messaging::ReplyHandler::_nil () + return new Messaging::ReplyHandler(stub); + return new POA_Messaging::_tao_collocated_ReplyHandler( + ACE_reinterpret_cast(POA_Messaging::ReplyHandler_ptr, servant), + stub ); - - return retval; } CORBA::Boolean Messaging::ReplyHandler::_is_a (const CORBA::Char *value, CORBA::Environment &ACE_TRY_ENV) @@ -1505,9 +1336,6 @@ TAO_NAMESPACE_BEGIN (Messaging) TAO_NAMESPACE_DEFINE (CORBA::TypeCode_ptr, _tc_ReplyHandler, &_tc_TAO_tc_Messaging_ReplyHandler) TAO_NAMESPACE_END -#endif /* TAO_HAS_AMI_CALLBACK */ - -#if defined(TAO_HAS_AMI_POLLER) Messaging::Poller_ptr Messaging::Poller::_narrow ( CORBA::Object_ptr obj, @@ -1537,30 +1365,11 @@ Messaging::Poller_ptr Messaging::Poller::_unchecked_narrow ( if (obj->_is_collocated () && obj->_servant() != 0) servant = obj->_servant()->_downcast ("IDL:Messaging/Poller:1.0"); if (servant == 0) - { - Messaging::Poller_ptr rval = Messaging::Poller::_nil (); - - ACE_NEW_RETURN (rval, - Messaging::Poller (stub), - Messaging::Poller::_nil ()); - - return rval; - } - - Messaging::Poller_ptr retval = - Messaging::Poller::_nil (); - - ACE_NEW_RETURN ( - retval, - POA_Messaging::_tao_collocated_Poller ( - ACE_reinterpret_cast (POA_Messaging::Poller_ptr, - servant), - stub - ), - Messaging::Poller::_nil () + return new Messaging::Poller(stub); + return new POA_Messaging::_tao_collocated_Poller( + ACE_reinterpret_cast(POA_Messaging::Poller_ptr, servant), + stub ); - - return retval; } CORBA::Object_ptr Messaging::Poller::operation_target ( @@ -2206,7 +2015,7 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::PolicyValueSe // **************************************************************** -#if defined(TAO_HAS_AMI_POLLER) +#if defined(TAO_POLLER) void operator<<= (CORBA::Any &_tao_any, const Messaging::ExceptionHolder &_tao_elem) // copying { Messaging::ExceptionHolder *_any_val; @@ -2376,35 +2185,29 @@ CORBA::Boolean operator>>= (const CORBA::Any &_tao_any, Messaging::Poller_ptr &_ ACE_ENDTRY; return 0; } -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Unbounded_Sequence<Messaging::PolicyValue>; -#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if defined(TAO_POLLER) template class TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; - template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ - -#if defined(TAO_HAS_AMI_POLLER) template class TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var>; + template class TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var>; template class TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var>; -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Unbounded_Sequence<Messaging::PolicyValue> -#if defined(TAO_HAS_AMI_CALLBACK) || defined (TAO_HAS_AMI_POLLER) +#if defined(TAO_POLLER) # pragma instantiate TAO_Object_Field_T<Messaging::ReplyHandler,Messaging::ReplyHandler_var> -# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> -#endif /* TAO_HAS_AMI_CALLBACK || TAO_HAS_AMI_POLLER */ - -#if defined(TAO_HAS_AMI_POLLER) # pragma instantiate TAO_Object_Field_T<Messaging::Poller,Messaging::Poller_var> +# pragma instantiate TAO_Object_Manager<Messaging::ReplyHandler,Messaging::ReplyHandler_var> # pragma instantiate TAO_Object_Manager<Messaging::Poller,Messaging::Poller_var> -#endif /* TAO_HAS_AMI_POLLER */ +#endif /* TAO_POLLER */ #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |