From 9f9a9bca0ebd24f3f338ea0ad3b4fd59a251638d Mon Sep 17 00:00:00 2001 From: parsons Date: Mon, 28 Jul 2003 20:53:51 +0000 Subject: ChangeLogTag: Mon Jul 28 15:48:13 2003 Jeff Parsons --- TAO/ChangeLog_ref | 28 ++ TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp | 2 +- TAO/tao/Messaging/Connection_Timeout_Policy_i.h | 2 +- TAO/tao/Messaging/MessagingC.cpp | 52 -- TAO/tao/Messaging/MessagingC.h | 26 +- TAO/tao/Messaging/Messaging_No_ImplC.cpp | 572 ---------------------- TAO/tao/Messaging/Messaging_No_ImplC.h | 286 +---------- TAO/tao/Messaging/Messaging_Policy_i.cpp | 2 +- TAO/tao/Messaging/Messaging_Policy_i.h | 2 +- TAO/tao/Messaging/Messaging_RT_PolicyC.cpp | 52 -- TAO/tao/Messaging/Messaging_RT_PolicyC.h | 26 +- TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp | 52 -- TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h | 26 +- TAO/tao/Messaging/TAO_ExtC.cpp | 52 -- TAO/tao/Messaging/TAO_ExtC.h | 26 +- TAO/tao/ORB_Core.cpp | 1 + 16 files changed, 63 insertions(+), 1144 deletions(-) diff --git a/TAO/ChangeLog_ref b/TAO/ChangeLog_ref index c243bb07da6..bf2a7eaa0a6 100644 --- a/TAO/ChangeLog_ref +++ b/TAO/ChangeLog_ref @@ -1,3 +1,31 @@ +Mon Jul 28 15:48:13 2003 Jeff Parsons + + * tao/ORB_Core.cpp: + + Added #include of ace/streams, + + * tao/Messaging/Connection_Timeout_Policy_i.cpp: + * tao/Messaging/Connection_Timeout_Policy_i.h: + * tao/Messaging/Messaging_Policy_i.cpp: + * tao/Messaging/Messaging_Policy_i.h: + * tao/Messaging/Messaging_RT_PolicyC.cpp: + * tao/Messaging/Messaging_RT_PolicyC.h: + + Changed signature of the hook() method to use bool& + instead of int&, to interoperate with changes in the + ORB core. + + * tao/Messaging/MessagingC.cpp: + * tao/Messaging/MessagingC.h: + * tao/Messaging/Messaging_No_ImplC.cpp: + * tao/Messaging/Messaging_No_ImplC.h: + * tao/Messaging/Messaging_SyncScope_PolicyC.cpp: + * tao/Messaging/Messaging_SyncScope_PolicyC.h: + * tao/Messaging/TAO_ExtC.cpp: + * tao/Messaging/TAO_ExtC.h: + + Removed tao_*_life and tao_*_cast. + Mon Jul 28 15:16:03 2003 Jeff Parsons * TAO_IDL/be/be_visitor_interface/strategized_proxy_broker_ss.cpp: diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp index 3251c8c4037..ae3568ba81a 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.cpp @@ -50,7 +50,7 @@ TAO_ConnectionTimeoutPolicy::policy_type ( void TAO_ConnectionTimeoutPolicy::hook (TAO_ORB_Core *orb_core, TAO_Stub *stub, - int &has_timeout, + bool &has_timeout, ACE_Time_Value &time_value) { CORBA::Policy_var policy = diff --git a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h index 2227eb12833..7eec93086e4 100644 --- a/TAO/tao/Messaging/Connection_Timeout_Policy_i.h +++ b/TAO/tao/Messaging/Connection_Timeout_Policy_i.h @@ -57,7 +57,7 @@ public: /// initialization time. static void hook (TAO_ORB_Core *orb_core, TAO_Stub *stub, - int &has_timeout, + bool &has_timeout, ACE_Time_Value &time_value); /// Helper method for the implementation of diff --git a/TAO/tao/Messaging/MessagingC.cpp b/TAO/tao/Messaging/MessagingC.cpp index 281f879cf5b..c9d3ec231f9 100644 --- a/TAO/tao/Messaging/MessagingC.cpp +++ b/TAO/tao/Messaging/MessagingC.cpp @@ -322,58 +322,6 @@ Messaging::ExceptionHolder_init::create_for_unmarshal (void) int Messaging::ReplyHandler::_tao_class_id = 0; -Messaging::ReplyHandler_ptr -Messaging::tao_ReplyHandler_life::tao_duplicate ( - Messaging::ReplyHandler_ptr p - ) -{ - return Messaging::ReplyHandler::_duplicate (p); -} - -void -Messaging::tao_ReplyHandler_life::tao_release ( - Messaging::ReplyHandler_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::ReplyHandler_ptr -Messaging::tao_ReplyHandler_life::tao_nil ( - void - ) -{ - return Messaging::ReplyHandler::_nil (); -} - -CORBA::Boolean -Messaging::tao_ReplyHandler_life::tao_marshal ( - Messaging::ReplyHandler_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::ReplyHandler_ptr -Messaging::tao_ReplyHandler_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::ReplyHandler::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_ReplyHandler_cast::tao_upcast ( - void *src - ) -{ - Messaging::ReplyHandler **tmp = - ACE_static_cast (Messaging::ReplyHandler **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< diff --git a/TAO/tao/Messaging/MessagingC.h b/TAO/tao/Messaging/MessagingC.h index 8069b983193..1b88836a5ab 100644 --- a/TAO/tao/Messaging/MessagingC.h +++ b/TAO/tao/Messaging/MessagingC.h @@ -203,38 +203,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - ReplyHandler, - tao_ReplyHandler_life + ReplyHandler > ReplyHandler_var; typedef TAO_Objref_Out_T< - ReplyHandler, - tao_ReplyHandler_life + ReplyHandler > ReplyHandler_out; - struct TAO_Messaging_Export tao_ReplyHandler_life - { - static ReplyHandler_ptr tao_duplicate (ReplyHandler_ptr); - static void tao_release (ReplyHandler_ptr); - static ReplyHandler_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ReplyHandler_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_ReplyHandler_cast - { - static ReplyHandler_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.cpp b/TAO/tao/Messaging/Messaging_No_ImplC.cpp index d4b94ffaed6..703d537d3ed 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.cpp +++ b/TAO/tao/Messaging/Messaging_No_ImplC.cpp @@ -204,58 +204,6 @@ TAO_NAMESPACE_END int Messaging::RebindPolicy::_tao_class_id = 0; -Messaging::RebindPolicy_ptr -Messaging::tao_RebindPolicy_life::tao_duplicate ( - Messaging::RebindPolicy_ptr p - ) -{ - return Messaging::RebindPolicy::_duplicate (p); -} - -void -Messaging::tao_RebindPolicy_life::tao_release ( - Messaging::RebindPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RebindPolicy_ptr -Messaging::tao_RebindPolicy_life::tao_nil ( - void - ) -{ - return Messaging::RebindPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RebindPolicy_life::tao_marshal ( - Messaging::RebindPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RebindPolicy_ptr -Messaging::tao_RebindPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RebindPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RebindPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RebindPolicy **tmp = - ACE_static_cast (Messaging::RebindPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -546,58 +494,6 @@ template class int Messaging::RequestPriorityPolicy::_tao_class_id = 0; -Messaging::RequestPriorityPolicy_ptr -Messaging::tao_RequestPriorityPolicy_life::tao_duplicate ( - Messaging::RequestPriorityPolicy_ptr p - ) -{ - return Messaging::RequestPriorityPolicy::_duplicate (p); -} - -void -Messaging::tao_RequestPriorityPolicy_life::tao_release ( - Messaging::RequestPriorityPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RequestPriorityPolicy_ptr -Messaging::tao_RequestPriorityPolicy_life::tao_nil ( - void - ) -{ - return Messaging::RequestPriorityPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RequestPriorityPolicy_life::tao_marshal ( - Messaging::RequestPriorityPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RequestPriorityPolicy_ptr -Messaging::tao_RequestPriorityPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RequestPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RequestPriorityPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RequestPriorityPolicy **tmp = - ACE_static_cast (Messaging::RequestPriorityPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -787,58 +683,6 @@ TAO_NAMESPACE_END int Messaging::ReplyPriorityPolicy::_tao_class_id = 0; -Messaging::ReplyPriorityPolicy_ptr -Messaging::tao_ReplyPriorityPolicy_life::tao_duplicate ( - Messaging::ReplyPriorityPolicy_ptr p - ) -{ - return Messaging::ReplyPriorityPolicy::_duplicate (p); -} - -void -Messaging::tao_ReplyPriorityPolicy_life::tao_release ( - Messaging::ReplyPriorityPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::ReplyPriorityPolicy_ptr -Messaging::tao_ReplyPriorityPolicy_life::tao_nil ( - void - ) -{ - return Messaging::ReplyPriorityPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_ReplyPriorityPolicy_life::tao_marshal ( - Messaging::ReplyPriorityPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::ReplyPriorityPolicy_ptr -Messaging::tao_ReplyPriorityPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::ReplyPriorityPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_ReplyPriorityPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::ReplyPriorityPolicy **tmp = - ACE_static_cast (Messaging::ReplyPriorityPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -1027,58 +871,6 @@ TAO_NAMESPACE_END int Messaging::RequestStartTimePolicy::_tao_class_id = 0; -Messaging::RequestStartTimePolicy_ptr -Messaging::tao_RequestStartTimePolicy_life::tao_duplicate ( - Messaging::RequestStartTimePolicy_ptr p - ) -{ - return Messaging::RequestStartTimePolicy::_duplicate (p); -} - -void -Messaging::tao_RequestStartTimePolicy_life::tao_release ( - Messaging::RequestStartTimePolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RequestStartTimePolicy_ptr -Messaging::tao_RequestStartTimePolicy_life::tao_nil ( - void - ) -{ - return Messaging::RequestStartTimePolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RequestStartTimePolicy_life::tao_marshal ( - Messaging::RequestStartTimePolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RequestStartTimePolicy_ptr -Messaging::tao_RequestStartTimePolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RequestStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RequestStartTimePolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RequestStartTimePolicy **tmp = - ACE_static_cast (Messaging::RequestStartTimePolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -1269,58 +1061,6 @@ TAO_NAMESPACE_END int Messaging::RequestEndTimePolicy::_tao_class_id = 0; -Messaging::RequestEndTimePolicy_ptr -Messaging::tao_RequestEndTimePolicy_life::tao_duplicate ( - Messaging::RequestEndTimePolicy_ptr p - ) -{ - return Messaging::RequestEndTimePolicy::_duplicate (p); -} - -void -Messaging::tao_RequestEndTimePolicy_life::tao_release ( - Messaging::RequestEndTimePolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RequestEndTimePolicy_ptr -Messaging::tao_RequestEndTimePolicy_life::tao_nil ( - void - ) -{ - return Messaging::RequestEndTimePolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RequestEndTimePolicy_life::tao_marshal ( - Messaging::RequestEndTimePolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RequestEndTimePolicy_ptr -Messaging::tao_RequestEndTimePolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RequestEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RequestEndTimePolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RequestEndTimePolicy **tmp = - ACE_static_cast (Messaging::RequestEndTimePolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -1510,58 +1250,6 @@ TAO_NAMESPACE_END int Messaging::ReplyStartTimePolicy::_tao_class_id = 0; -Messaging::ReplyStartTimePolicy_ptr -Messaging::tao_ReplyStartTimePolicy_life::tao_duplicate ( - Messaging::ReplyStartTimePolicy_ptr p - ) -{ - return Messaging::ReplyStartTimePolicy::_duplicate (p); -} - -void -Messaging::tao_ReplyStartTimePolicy_life::tao_release ( - Messaging::ReplyStartTimePolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::ReplyStartTimePolicy_ptr -Messaging::tao_ReplyStartTimePolicy_life::tao_nil ( - void - ) -{ - return Messaging::ReplyStartTimePolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_ReplyStartTimePolicy_life::tao_marshal ( - Messaging::ReplyStartTimePolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::ReplyStartTimePolicy_ptr -Messaging::tao_ReplyStartTimePolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::ReplyStartTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_ReplyStartTimePolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::ReplyStartTimePolicy **tmp = - ACE_static_cast (Messaging::ReplyStartTimePolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -1751,58 +1439,6 @@ TAO_NAMESPACE_END int Messaging::ReplyEndTimePolicy::_tao_class_id = 0; -Messaging::ReplyEndTimePolicy_ptr -Messaging::tao_ReplyEndTimePolicy_life::tao_duplicate ( - Messaging::ReplyEndTimePolicy_ptr p - ) -{ - return Messaging::ReplyEndTimePolicy::_duplicate (p); -} - -void -Messaging::tao_ReplyEndTimePolicy_life::tao_release ( - Messaging::ReplyEndTimePolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::ReplyEndTimePolicy_ptr -Messaging::tao_ReplyEndTimePolicy_life::tao_nil ( - void - ) -{ - return Messaging::ReplyEndTimePolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_ReplyEndTimePolicy_life::tao_marshal ( - Messaging::ReplyEndTimePolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::ReplyEndTimePolicy_ptr -Messaging::tao_ReplyEndTimePolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::ReplyEndTimePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_ReplyEndTimePolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::ReplyEndTimePolicy **tmp = - ACE_static_cast (Messaging::ReplyEndTimePolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -1991,58 +1627,6 @@ TAO_NAMESPACE_END int Messaging::RelativeRequestTimeoutPolicy::_tao_class_id = 0; -Messaging::RelativeRequestTimeoutPolicy_ptr -Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_duplicate ( - Messaging::RelativeRequestTimeoutPolicy_ptr p - ) -{ - return Messaging::RelativeRequestTimeoutPolicy::_duplicate (p); -} - -void -Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_release ( - Messaging::RelativeRequestTimeoutPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RelativeRequestTimeoutPolicy_ptr -Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_nil ( - void - ) -{ - return Messaging::RelativeRequestTimeoutPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RelativeRequestTimeoutPolicy_life::tao_marshal ( - Messaging::RelativeRequestTimeoutPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RelativeRequestTimeoutPolicy_ptr -Messaging::tao_RelativeRequestTimeoutPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RelativeRequestTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RelativeRequestTimeoutPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RelativeRequestTimeoutPolicy **tmp = - ACE_static_cast (Messaging::RelativeRequestTimeoutPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -2344,58 +1928,6 @@ template class int Messaging::RoutingPolicy::_tao_class_id = 0; -Messaging::RoutingPolicy_ptr -Messaging::tao_RoutingPolicy_life::tao_duplicate ( - Messaging::RoutingPolicy_ptr p - ) -{ - return Messaging::RoutingPolicy::_duplicate (p); -} - -void -Messaging::tao_RoutingPolicy_life::tao_release ( - Messaging::RoutingPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RoutingPolicy_ptr -Messaging::tao_RoutingPolicy_life::tao_nil ( - void - ) -{ - return Messaging::RoutingPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RoutingPolicy_life::tao_marshal ( - Messaging::RoutingPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RoutingPolicy_ptr -Messaging::tao_RoutingPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RoutingPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RoutingPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RoutingPolicy **tmp = - ACE_static_cast (Messaging::RoutingPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -2581,58 +2113,6 @@ TAO_NAMESPACE_END int Messaging::MaxHopsPolicy::_tao_class_id = 0; -Messaging::MaxHopsPolicy_ptr -Messaging::tao_MaxHopsPolicy_life::tao_duplicate ( - Messaging::MaxHopsPolicy_ptr p - ) -{ - return Messaging::MaxHopsPolicy::_duplicate (p); -} - -void -Messaging::tao_MaxHopsPolicy_life::tao_release ( - Messaging::MaxHopsPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::MaxHopsPolicy_ptr -Messaging::tao_MaxHopsPolicy_life::tao_nil ( - void - ) -{ - return Messaging::MaxHopsPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_MaxHopsPolicy_life::tao_marshal ( - Messaging::MaxHopsPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::MaxHopsPolicy_ptr -Messaging::tao_MaxHopsPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::MaxHopsPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_MaxHopsPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::MaxHopsPolicy **tmp = - ACE_static_cast (Messaging::MaxHopsPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< @@ -2818,58 +2298,6 @@ TAO_NAMESPACE_END int Messaging::QueueOrderPolicy::_tao_class_id = 0; -Messaging::QueueOrderPolicy_ptr -Messaging::tao_QueueOrderPolicy_life::tao_duplicate ( - Messaging::QueueOrderPolicy_ptr p - ) -{ - return Messaging::QueueOrderPolicy::_duplicate (p); -} - -void -Messaging::tao_QueueOrderPolicy_life::tao_release ( - Messaging::QueueOrderPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::QueueOrderPolicy_ptr -Messaging::tao_QueueOrderPolicy_life::tao_nil ( - void - ) -{ - return Messaging::QueueOrderPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_QueueOrderPolicy_life::tao_marshal ( - Messaging::QueueOrderPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::QueueOrderPolicy_ptr -Messaging::tao_QueueOrderPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::QueueOrderPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_QueueOrderPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::QueueOrderPolicy **tmp = - ACE_static_cast (Messaging::QueueOrderPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< diff --git a/TAO/tao/Messaging/Messaging_No_ImplC.h b/TAO/tao/Messaging/Messaging_No_ImplC.h index 3f0b7f7864b..2ca647a0e3f 100644 --- a/TAO/tao/Messaging/Messaging_No_ImplC.h +++ b/TAO/tao/Messaging/Messaging_No_ImplC.h @@ -181,38 +181,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RebindPolicy, - tao_RebindPolicy_life + RebindPolicy > RebindPolicy_var; typedef TAO_Objref_Out_T< - RebindPolicy, - tao_RebindPolicy_life + RebindPolicy > RebindPolicy_out; - struct TAO_Messaging_Export tao_RebindPolicy_life - { - static RebindPolicy_ptr tao_duplicate (RebindPolicy_ptr); - static void tao_release (RebindPolicy_ptr); - static RebindPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RebindPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RebindPolicy_cast - { - static RebindPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -332,38 +310,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RequestPriorityPolicy, - tao_RequestPriorityPolicy_life + RequestPriorityPolicy > RequestPriorityPolicy_var; typedef TAO_Objref_Out_T< - RequestPriorityPolicy, - tao_RequestPriorityPolicy_life + RequestPriorityPolicy > RequestPriorityPolicy_out; - struct TAO_Messaging_Export tao_RequestPriorityPolicy_life - { - static RequestPriorityPolicy_ptr tao_duplicate (RequestPriorityPolicy_ptr); - static void tao_release (RequestPriorityPolicy_ptr); - static RequestPriorityPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RequestPriorityPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RequestPriorityPolicy_cast - { - static RequestPriorityPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -451,38 +407,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - ReplyPriorityPolicy, - tao_ReplyPriorityPolicy_life + ReplyPriorityPolicy > ReplyPriorityPolicy_var; typedef TAO_Objref_Out_T< - ReplyPriorityPolicy, - tao_ReplyPriorityPolicy_life + ReplyPriorityPolicy > ReplyPriorityPolicy_out; - struct TAO_Messaging_Export tao_ReplyPriorityPolicy_life - { - static ReplyPriorityPolicy_ptr tao_duplicate (ReplyPriorityPolicy_ptr); - static void tao_release (ReplyPriorityPolicy_ptr); - static ReplyPriorityPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ReplyPriorityPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_ReplyPriorityPolicy_cast - { - static ReplyPriorityPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -570,38 +504,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RequestStartTimePolicy, - tao_RequestStartTimePolicy_life + RequestStartTimePolicy > RequestStartTimePolicy_var; typedef TAO_Objref_Out_T< - RequestStartTimePolicy, - tao_RequestStartTimePolicy_life + RequestStartTimePolicy > RequestStartTimePolicy_out; - struct TAO_Messaging_Export tao_RequestStartTimePolicy_life - { - static RequestStartTimePolicy_ptr tao_duplicate (RequestStartTimePolicy_ptr); - static void tao_release (RequestStartTimePolicy_ptr); - static RequestStartTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RequestStartTimePolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RequestStartTimePolicy_cast - { - static RequestStartTimePolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -689,38 +601,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RequestEndTimePolicy, - tao_RequestEndTimePolicy_life + RequestEndTimePolicy > RequestEndTimePolicy_var; typedef TAO_Objref_Out_T< - RequestEndTimePolicy, - tao_RequestEndTimePolicy_life + RequestEndTimePolicy > RequestEndTimePolicy_out; - struct TAO_Messaging_Export tao_RequestEndTimePolicy_life - { - static RequestEndTimePolicy_ptr tao_duplicate (RequestEndTimePolicy_ptr); - static void tao_release (RequestEndTimePolicy_ptr); - static RequestEndTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RequestEndTimePolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RequestEndTimePolicy_cast - { - static RequestEndTimePolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -808,38 +698,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - ReplyStartTimePolicy, - tao_ReplyStartTimePolicy_life + ReplyStartTimePolicy > ReplyStartTimePolicy_var; typedef TAO_Objref_Out_T< - ReplyStartTimePolicy, - tao_ReplyStartTimePolicy_life + ReplyStartTimePolicy > ReplyStartTimePolicy_out; - struct TAO_Messaging_Export tao_ReplyStartTimePolicy_life - { - static ReplyStartTimePolicy_ptr tao_duplicate (ReplyStartTimePolicy_ptr); - static void tao_release (ReplyStartTimePolicy_ptr); - static ReplyStartTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ReplyStartTimePolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_ReplyStartTimePolicy_cast - { - static ReplyStartTimePolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -927,38 +795,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - ReplyEndTimePolicy, - tao_ReplyEndTimePolicy_life + ReplyEndTimePolicy > ReplyEndTimePolicy_var; typedef TAO_Objref_Out_T< - ReplyEndTimePolicy, - tao_ReplyEndTimePolicy_life + ReplyEndTimePolicy > ReplyEndTimePolicy_out; - struct TAO_Messaging_Export tao_ReplyEndTimePolicy_life - { - static ReplyEndTimePolicy_ptr tao_duplicate (ReplyEndTimePolicy_ptr); - static void tao_release (ReplyEndTimePolicy_ptr); - static ReplyEndTimePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ReplyEndTimePolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_ReplyEndTimePolicy_cast - { - static ReplyEndTimePolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1046,38 +892,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RelativeRequestTimeoutPolicy, - tao_RelativeRequestTimeoutPolicy_life + RelativeRequestTimeoutPolicy > RelativeRequestTimeoutPolicy_var; typedef TAO_Objref_Out_T< - RelativeRequestTimeoutPolicy, - tao_RelativeRequestTimeoutPolicy_life + RelativeRequestTimeoutPolicy > RelativeRequestTimeoutPolicy_out; - struct TAO_Messaging_Export tao_RelativeRequestTimeoutPolicy_life - { - static RelativeRequestTimeoutPolicy_ptr tao_duplicate (RelativeRequestTimeoutPolicy_ptr); - static void tao_release (RelativeRequestTimeoutPolicy_ptr); - static RelativeRequestTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RelativeRequestTimeoutPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RelativeRequestTimeoutPolicy_cast - { - static RelativeRequestTimeoutPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1197,38 +1021,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RoutingPolicy, - tao_RoutingPolicy_life + RoutingPolicy > RoutingPolicy_var; typedef TAO_Objref_Out_T< - RoutingPolicy, - tao_RoutingPolicy_life + RoutingPolicy > RoutingPolicy_out; - struct TAO_Messaging_Export tao_RoutingPolicy_life - { - static RoutingPolicy_ptr tao_duplicate (RoutingPolicy_ptr); - static void tao_release (RoutingPolicy_ptr); - static RoutingPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RoutingPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RoutingPolicy_cast - { - static RoutingPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1316,38 +1118,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - MaxHopsPolicy, - tao_MaxHopsPolicy_life + MaxHopsPolicy > MaxHopsPolicy_var; typedef TAO_Objref_Out_T< - MaxHopsPolicy, - tao_MaxHopsPolicy_life + MaxHopsPolicy > MaxHopsPolicy_out; - struct TAO_Messaging_Export tao_MaxHopsPolicy_life - { - static MaxHopsPolicy_ptr tao_duplicate (MaxHopsPolicy_ptr); - static void tao_release (MaxHopsPolicy_ptr); - static MaxHopsPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - MaxHopsPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_MaxHopsPolicy_cast - { - static MaxHopsPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from @@ -1435,38 +1215,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - QueueOrderPolicy, - tao_QueueOrderPolicy_life + QueueOrderPolicy > QueueOrderPolicy_var; typedef TAO_Objref_Out_T< - QueueOrderPolicy, - tao_QueueOrderPolicy_life + QueueOrderPolicy > QueueOrderPolicy_out; - struct TAO_Messaging_Export tao_QueueOrderPolicy_life - { - static QueueOrderPolicy_ptr tao_duplicate (QueueOrderPolicy_ptr); - static void tao_release (QueueOrderPolicy_ptr); - static QueueOrderPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - QueueOrderPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_QueueOrderPolicy_cast - { - static QueueOrderPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/Messaging_Policy_i.cpp b/TAO/tao/Messaging/Messaging_Policy_i.cpp index 13b11e8c1ae..c036d38f77f 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.cpp +++ b/TAO/tao/Messaging/Messaging_Policy_i.cpp @@ -55,7 +55,7 @@ TAO_RelativeRoundtripTimeoutPolicy::policy_type ( void TAO_RelativeRoundtripTimeoutPolicy::hook (TAO_ORB_Core *orb_core, TAO_Stub *stub, - int &has_timeout, + bool &has_timeout, ACE_Time_Value &time_value) { CORBA::Policy_var policy = diff --git a/TAO/tao/Messaging/Messaging_Policy_i.h b/TAO/tao/Messaging/Messaging_Policy_i.h index acaa7b60b73..1a890a8a1a5 100644 --- a/TAO/tao/Messaging/Messaging_Policy_i.h +++ b/TAO/tao/Messaging/Messaging_Policy_i.h @@ -51,7 +51,7 @@ public: /// initialization time. static void hook (TAO_ORB_Core *orb_core, TAO_Stub *stub, - int &has_timeout, + bool &has_timeout, ACE_Time_Value &time_value); /// Helper method for the implementation of diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp index aade03c45cd..450cd1d8619 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.cpp @@ -94,58 +94,6 @@ TAO_NAMESPACE_END int Messaging::RelativeRoundtripTimeoutPolicy::_tao_class_id = 0; -Messaging::RelativeRoundtripTimeoutPolicy_ptr -Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_duplicate ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr p - ) -{ - return Messaging::RelativeRoundtripTimeoutPolicy::_duplicate (p); -} - -void -Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_release ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::RelativeRoundtripTimeoutPolicy_ptr -Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_nil ( - void - ) -{ - return Messaging::RelativeRoundtripTimeoutPolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_RelativeRoundtripTimeoutPolicy_life::tao_marshal ( - Messaging::RelativeRoundtripTimeoutPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::RelativeRoundtripTimeoutPolicy_ptr -Messaging::tao_RelativeRoundtripTimeoutPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::RelativeRoundtripTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_RelativeRoundtripTimeoutPolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::RelativeRoundtripTimeoutPolicy **tmp = - ACE_static_cast (Messaging::RelativeRoundtripTimeoutPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< diff --git a/TAO/tao/Messaging/Messaging_RT_PolicyC.h b/TAO/tao/Messaging/Messaging_RT_PolicyC.h index 8ebb2855cc7..41a3f522758 100644 --- a/TAO/tao/Messaging/Messaging_RT_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_RT_PolicyC.h @@ -92,38 +92,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - RelativeRoundtripTimeoutPolicy, - tao_RelativeRoundtripTimeoutPolicy_life + RelativeRoundtripTimeoutPolicy > RelativeRoundtripTimeoutPolicy_var; typedef TAO_Objref_Out_T< - RelativeRoundtripTimeoutPolicy, - tao_RelativeRoundtripTimeoutPolicy_life + RelativeRoundtripTimeoutPolicy > RelativeRoundtripTimeoutPolicy_out; - struct TAO_Messaging_Export tao_RelativeRoundtripTimeoutPolicy_life - { - static RelativeRoundtripTimeoutPolicy_ptr tao_duplicate (RelativeRoundtripTimeoutPolicy_ptr); - static void tao_release (RelativeRoundtripTimeoutPolicy_ptr); - static RelativeRoundtripTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - RelativeRoundtripTimeoutPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_RelativeRoundtripTimeoutPolicy_cast - { - static RelativeRoundtripTimeoutPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp index f194f502cf3..563daee8b0b 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.cpp @@ -39,58 +39,6 @@ int Messaging::SyncScopePolicy::_tao_class_id = 0; -Messaging::SyncScopePolicy_ptr -Messaging::tao_SyncScopePolicy_life::tao_duplicate ( - Messaging::SyncScopePolicy_ptr p - ) -{ - return Messaging::SyncScopePolicy::_duplicate (p); -} - -void -Messaging::tao_SyncScopePolicy_life::tao_release ( - Messaging::SyncScopePolicy_ptr p - ) -{ - CORBA::release (p); -} - -Messaging::SyncScopePolicy_ptr -Messaging::tao_SyncScopePolicy_life::tao_nil ( - void - ) -{ - return Messaging::SyncScopePolicy::_nil (); -} - -CORBA::Boolean -Messaging::tao_SyncScopePolicy_life::tao_marshal ( - Messaging::SyncScopePolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -Messaging::SyncScopePolicy_ptr -Messaging::tao_SyncScopePolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return Messaging::SyncScopePolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -Messaging::tao_SyncScopePolicy_cast::tao_upcast ( - void *src - ) -{ - Messaging::SyncScopePolicy **tmp = - ACE_static_cast (Messaging::SyncScopePolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< diff --git a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h index 1d8ec8e11c6..26643c22380 100644 --- a/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h +++ b/TAO/tao/Messaging/Messaging_SyncScope_PolicyC.h @@ -81,38 +81,16 @@ TAO_NAMESPACE Messaging typedef TAO_Objref_Var_T< - SyncScopePolicy, - tao_SyncScopePolicy_life + SyncScopePolicy > SyncScopePolicy_var; typedef TAO_Objref_Out_T< - SyncScopePolicy, - tao_SyncScopePolicy_life + SyncScopePolicy > SyncScopePolicy_out; - struct TAO_Messaging_Export tao_SyncScopePolicy_life - { - static SyncScopePolicy_ptr tao_duplicate (SyncScopePolicy_ptr); - static void tao_release (SyncScopePolicy_ptr); - static SyncScopePolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - SyncScopePolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_SyncScopePolicy_cast - { - static SyncScopePolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/Messaging/TAO_ExtC.cpp b/TAO/tao/Messaging/TAO_ExtC.cpp index 5596d6bbf7e..6fd4a0c7007 100644 --- a/TAO/tao/Messaging/TAO_ExtC.cpp +++ b/TAO/tao/Messaging/TAO_ExtC.cpp @@ -38,58 +38,6 @@ int TAO::ConnectionTimeoutPolicy::_tao_class_id = 0; -TAO::ConnectionTimeoutPolicy_ptr -TAO::tao_ConnectionTimeoutPolicy_life::tao_duplicate ( - TAO::ConnectionTimeoutPolicy_ptr p - ) -{ - return TAO::ConnectionTimeoutPolicy::_duplicate (p); -} - -void -TAO::tao_ConnectionTimeoutPolicy_life::tao_release ( - TAO::ConnectionTimeoutPolicy_ptr p - ) -{ - CORBA::release (p); -} - -TAO::ConnectionTimeoutPolicy_ptr -TAO::tao_ConnectionTimeoutPolicy_life::tao_nil ( - void - ) -{ - return TAO::ConnectionTimeoutPolicy::_nil (); -} - -CORBA::Boolean -TAO::tao_ConnectionTimeoutPolicy_life::tao_marshal ( - TAO::ConnectionTimeoutPolicy_ptr p, - TAO_OutputCDR &cdr - ) -{ - return p->marshal (cdr); -} - -TAO::ConnectionTimeoutPolicy_ptr -TAO::tao_ConnectionTimeoutPolicy_cast::tao_narrow ( - CORBA::Object *p - ACE_ENV_ARG_DECL - ) -{ - return TAO::ConnectionTimeoutPolicy::_narrow (p ACE_ENV_ARG_PARAMETER); -} - -CORBA::Object * -TAO::tao_ConnectionTimeoutPolicy_cast::tao_upcast ( - void *src - ) -{ - TAO::ConnectionTimeoutPolicy **tmp = - ACE_static_cast (TAO::ConnectionTimeoutPolicy **, src); - return *tmp; -} - #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) template class TAO_Objref_Var_T< diff --git a/TAO/tao/Messaging/TAO_ExtC.h b/TAO/tao/Messaging/TAO_ExtC.h index 226fc22df04..620f08354d5 100644 --- a/TAO/tao/Messaging/TAO_ExtC.h +++ b/TAO/tao/Messaging/TAO_ExtC.h @@ -81,38 +81,16 @@ TAO_NAMESPACE TAO typedef TAO_Objref_Var_T< - ConnectionTimeoutPolicy, - tao_ConnectionTimeoutPolicy_life + ConnectionTimeoutPolicy > ConnectionTimeoutPolicy_var; typedef TAO_Objref_Out_T< - ConnectionTimeoutPolicy, - tao_ConnectionTimeoutPolicy_life + ConnectionTimeoutPolicy > ConnectionTimeoutPolicy_out; - struct TAO_Messaging_Export tao_ConnectionTimeoutPolicy_life - { - static ConnectionTimeoutPolicy_ptr tao_duplicate (ConnectionTimeoutPolicy_ptr); - static void tao_release (ConnectionTimeoutPolicy_ptr); - static ConnectionTimeoutPolicy_ptr tao_nil (void); - static CORBA::Boolean tao_marshal ( - ConnectionTimeoutPolicy_ptr, - TAO_OutputCDR & - ); - }; - - struct TAO_Messaging_Export tao_ConnectionTimeoutPolicy_cast - { - static ConnectionTimeoutPolicy_ptr tao_narrow ( - CORBA::Object_ptr - ACE_ENV_ARG_DECL - ); - static CORBA::Object_ptr tao_upcast (void *); - }; - #endif /* end #if !defined */ // TAO_IDL - Generated from diff --git a/TAO/tao/ORB_Core.cpp b/TAO/tao/ORB_Core.cpp index f355770c08b..a05cb484cdc 100644 --- a/TAO/tao/ORB_Core.cpp +++ b/TAO/tao/ORB_Core.cpp @@ -52,6 +52,7 @@ #include "ace/Dynamic_Service.h" #include "ace/Arg_Shifter.h" #include "ace/Argv_Type_Converter.h" +#include "ace/streams.h" #include "Codeset_Manager.h" -- cgit v1.2.1