diff options
Diffstat (limited to 'TAO/tao')
| -rw-r--r-- | TAO/tao/Any.cpp | 46 | ||||
| -rw-r--r-- | TAO/tao/Object.cpp | 64 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Default_ORTC.cpp | 36 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/Default_ORTC.h | 4 | ||||
| -rw-r--r-- | TAO/tao/PortableServer/PortableServerC.cpp | 165 | ||||
| -rw-r--r-- | TAO/tao/Typecode.cpp | 65 |
6 files changed, 316 insertions, 64 deletions
diff --git a/TAO/tao/Any.cpp b/TAO/tao/Any.cpp index 77bdf3e1b43..904116eed11 100644 --- a/TAO/tao/Any.cpp +++ b/TAO/tao/Any.cpp @@ -774,11 +774,26 @@ template class TAO::Any_Impl_T<CORBA::WChar>; template class TAO::Any_Impl_T<CORBA::Object>; template class TAO::Arg_Traits<CORBA::Any>; -/*template class TAO::Var_Size_Arg_Traits_T<CORBA::Any, +template class TAO::Var_Size_Arg_Traits_T<CORBA::Any, CORBA::Any_var, CORBA::Any_out>; -*/ - +template class TAO::In_Var_Size_Argument_T<CORBA::Any>; +template class TAO::Inout_Var_Size_Argument_T<CORBA::Any>; +template class TAO::Out_Var_Size_Argument_T<CORBA::Any, + CORBA::Any_out>; +template class TAO::Ret_Var_Size_Argument_T<CORBA::Any, + CORBA::Any_var>; + +template class TAO::SArg_Traits<CORBA::Any>; +template class TAO::Var_Size_SArg_Traits_T<CORBA::Any, + CORBA::Any_var, + CORBA::Any_out>; +template class TAO::In_Var_Size_SArgument_T<CORBA::Any>; +template class TAO::Inout_Var_Size_SArgument_T<CORBA::Any>; +template class TAO::Out_Var_Size_SArgument_T<CORBA::Any, + CORBA::Any_var>; +template class TAO::Ret_Var_Size_SArgument_T<CORBA::Any, + CORBA::Any_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO::Any_Special_Impl_T< @@ -799,12 +814,27 @@ template class TAO::Arg_Traits<CORBA::Any>; #pragma instantiate TAO::Any_Impl_T<char> #pragma instantiate TAO::Any_Impl_T<CORBA::WChar> #pragma instantiate TAO::Any_Impl_T<CORBA::Object> -#pragma instantiate TAO::Any_Impl_T<CORBA::AbstractBase> -#pragma instantiate TAO::Any_Impl_T<CORBA::ValueBase> #pragma instantiate TAO::Arg_Traits<CORBA::Any> -#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, - CORBA::Any_var, - CORBA::Any_out> +#pragma instantiate TAO::Var_Size_Arg_Traits_T<CORBA::Any, \ + CORBA::Any_var, \ + CORBA::Any_out> +#pragma instantiate TAO::In_Var_Size_Argument_T<CORBA::Any> +#pragma instantiate TAO::Inout_Var_Size_Argument_T<CORBA::Any> +#pragma instantiate TAO::Out_Var_Size_Argument_T<CORBA::Any, \ + CORBA::Any_out> +#pragma instantiate TAO::Ret_Var_Size_Argument_T<CORBA::Any, \ + CORBA::Any_var> + +#pragma instantiate TAO::SArg_Traits<CORBA::Any> +#pragma instantiate TAO::Var_Size_SArg_Traits_T<CORBA::Any, \ + CORBA::Any_var, \ + CORBA::Any_out> +#pragma instantiate TAO::In_Var_Size_SArgument_T<CORBA::Any> +#pragma instantiate TAO::Inout_Var_Size_SArgument_T<CORBA::Any> +#pragma instantiate TAO::Out_Var_Size_SArgument_T<CORBA::Any, \ + CORBA::Any_var> +#pragma instantiate TAO::Ret_Var_Size_SArgument_T<CORBA::Any, \ + CORBA::Any_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/Object.cpp b/TAO/tao/Object.cpp index 4dc3f55b3d5..62158c09569 100644 --- a/TAO/tao/Object.cpp +++ b/TAO/tao/Object.cpp @@ -996,19 +996,69 @@ TAO::Object_Proxy_Broker * (*_TAO_Object_Proxy_Broker_Factory_function_pointer) template class TAO_Pseudo_Var_T<CORBA::Object>; template class TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var>; + template class TAO::Arg_Traits<CORBA::Object>; -template class TAO::Object_Arg_Traits_T<CORBA::Object_ptr, - CORBA::Object_var, - CORBA::Object_out, - TAO::Objref_Traits<CORBA::Object> >; +template class + TAO::Object_Arg_Traits_T<CORBA::Object_ptr, + CORBA::Object_var, + CORBA::Object_out, + TAO::Objref_Traits<CORBA::Object> >; +template class TAO::In_Object_Argument_T<CORBA::Object_ptr>; +template class + TAO::Inout_Object_Argument_T<CORBA::Object_ptr, + TAO::Objref_Traits<CORBA::Object> >; +template class TAO::Out_Object_Argument_T<CORBA::Object_ptr, + CORBA::Object_out>; +template class TAO::Ret_Object_Argument_T<CORBA::Object_ptr, + CORBA::Object_var>; + +template class TAO::SArg_Traits<CORBA::Object>; +template class TAO::Object_SArg_Traits_T<CORBA::Object_ptr, + CORBA::Object_var, + CORBA::Object_out>; +template class TAO::In_Object_SArgument_T<CORBA::Object_ptr, + CORBA::Object_var>; +template class TAO::Inout_Object_SArgument_T<CORBA::Object_ptr, + CORBA::Object_var>; +template class TAO::Out_Object_SArgument_T<CORBA::Object_ptr, + CORBA::Object_var, + CORBA::Object_out>; +template class TAO::Ret_Object_SArgument_T<CORBA::Object_ptr, + CORBA::Object_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) #pragma instantiate TAO_Pseudo_Var_T<CORBA::Object> #pragma instantiate TAO_Pseudo_Out_T<CORBA::Object, CORBA::Object_var> + +#pragma instantiate TAO::Objref_Traits<CORBA::Object> #pragma instantiate TAO::Arg_Traits<CORBA::Object> -#pragma instantiate TAO::Object_Arg_Traits_T<CORBA::Object_ptr, \ - CORBA::Object_var, \ - CORBA::Object_out>; +#pragma instantiate \ + TAO::Object_Arg_Traits_T<CORBA::Object_ptr, \ + CORBA::Object_var, \ + CORBA::Object_out, \ + TAO::Objref_Traits<CORBA::Object> > +#pragma instantiate TAO::In_Object_Argument_T<CORBA::Object_ptr> +#pragma instantiate \ + TAO::Inout_Object_Argument_T<CORBA::Object_ptr, \ + TAO::Objref_Traits<CORBA::Object> > +#pragma instantiate TAO::Out_Object_Argument_T<CORBA::Object_ptr, \ + CORBA::Object_out> +#pragma instantiate TAO::Ret_Object_Argument_T<CORBA::Object_ptr, \ + CORBA::Object_var> + +#pragma instantiate TAO::SArg_Traits<CORBA::Object> +#pragma instantiate TAO::Object_SArg_Traits_T<CORBA::Object_ptr, \ + CORBA::Object_var, \ + CORBA::Object_out> +#pragma instantiate TAO::In_Object_SArgument_T<CORBA::Object_ptr, \ + CORBA::Object_var> +#pragma instantiate TAO::Inout_Object_SArgument_T<CORBA::Object_ptr, \ + CORBA::Object_var> +#pragma instantiate TAO::Out_Object_SArgument_T<CORBA::Object_ptr, \ + CORBA::Object_var, \ + CORBA::Object_out> +#pragma instantiate TAO::Ret_Object_SArgument_T<CORBA::Object_ptr, \ + CORBA::Object_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ diff --git a/TAO/tao/PortableServer/Default_ORTC.cpp b/TAO/tao/PortableServer/Default_ORTC.cpp index 6225b1976ca..4f9deaae657 100644 --- a/TAO/tao/PortableServer/Default_ORTC.cpp +++ b/TAO/tao/PortableServer/Default_ORTC.cpp @@ -123,7 +123,7 @@ TAO_Default_ORT::ObjectReferenceTemplate::_downcast (CORBA::ValueBase *v) return 0; } - return (ObjectReferenceTemplate *) v->_tao_obv_narrow ((ptrdiff_t) &_downcast); + return dynamic_cast<TAO_Default_ORT::ObjectReferenceTemplate *> (v); } const char * @@ -132,40 +132,6 @@ TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_repository_id (void) const return this->_tao_obv_static_repository_id (); } -void * -#if defined (_MSC_VER) -TAO_Default_ORT::ObjectReferenceTemplate::TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t type_id) -#else -TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) -#endif /* _MSC_VER */ -{ - if (type_id == (ptrdiff_t) &_downcast) - { - return this; - } - - void *rval = 0; - - if (rval == 0) - { -#if defined (_MSC_VER) - rval = this->PortableInterceptor_ObjectReferenceTemplate_tao_obv_narrow (type_id); -#else - rval = this->PortableInterceptor::ObjectReferenceTemplate::_tao_obv_narrow (type_id); -#endif /* _MSC_VER */ - } - - return rval; -} - -#if defined (_MSC_VER) -void * -TAO_Default_ORT::ObjectReferenceTemplate::_tao_obv_narrow (ptrdiff_t type_id) -{ - return this->TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (type_id); -} -#endif /* _MSC_VER */ - void TAO_Default_ORT::ObjectReferenceTemplate::_tao_any_destructor (void *_tao_void_pointer) { diff --git a/TAO/tao/PortableServer/Default_ORTC.h b/TAO/tao/PortableServer/Default_ORTC.h index e1e134d5a0f..f90e1b000f6 100644 --- a/TAO/tao/PortableServer/Default_ORTC.h +++ b/TAO/tao/PortableServer/Default_ORTC.h @@ -134,10 +134,6 @@ namespace TAO_Default_ORT ObjectReferenceTemplate (void); virtual ~ObjectReferenceTemplate (void); - virtual void *_tao_obv_narrow (ptrdiff_t); -#if defined (_MSC_VER) - virtual void *TAO_Default_ORT_ObjectReferenceTemplate_tao_obv_narrow (ptrdiff_t); -#endif /* _MSC_VER */ virtual CORBA::Boolean _tao_marshal_v (TAO_OutputCDR &); virtual CORBA::Boolean _tao_unmarshal_v (TAO_InputCDR &); diff --git a/TAO/tao/PortableServer/PortableServerC.cpp b/TAO/tao/PortableServer/PortableServerC.cpp index 3c4e9ebd545..5e843e2f973 100644 --- a/TAO/tao/PortableServer/PortableServerC.cpp +++ b/TAO/tao/PortableServer/PortableServerC.cpp @@ -28,7 +28,6 @@ // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_codegen.cpp:301 - #include "PortableServerC.h" #include "tao/Stub.h" #include "tao/Invocation_Adapter.h" @@ -2942,6 +2941,56 @@ static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_AdapterInactive ( ::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_AdapterInactive = &_tc_TAO_tc_PortableServer_POAManager_AdapterInactive; +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_typecode/typecode_defn.cpp:284 + +static const CORBA::Long _oc_PortableServer_POAManager_State[] = +{ + TAO_ENCAP_BYTE_ORDER, // byte order + 48, + ACE_NTOHL (0x49444c3a), + ACE_NTOHL (0x6f6d672e), + ACE_NTOHL (0x6f72672f), + ACE_NTOHL (0x506f7274), + ACE_NTOHL (0x61626c65), + ACE_NTOHL (0x53657276), + ACE_NTOHL (0x65722f50), + ACE_NTOHL (0x4f414d61), + ACE_NTOHL (0x6e616765), + ACE_NTOHL (0x722f5374), + ACE_NTOHL (0x6174653a), + ACE_NTOHL (0x322e3300), // repository ID = IDL:omg.org/PortableServer/POAManager/State:2.3 + 6, + ACE_NTOHL (0x53746174), + ACE_NTOHL (0x65000000), // name = State + 4, // member count + 8, + ACE_NTOHL (0x484f4c44), + ACE_NTOHL (0x494e4700), // name = HOLDING + 7, + ACE_NTOHL (0x41435449), + ACE_NTOHL (0x56450000), // name = ACTIVE + 11, + ACE_NTOHL (0x44495343), + ACE_NTOHL (0x41524449), + ACE_NTOHL (0x4e470000), // name = DISCARDING + 9, + ACE_NTOHL (0x494e4143), + ACE_NTOHL (0x54495645), + ACE_NTOHL (0x0), // name = INACTIVE + }; + +static CORBA::TypeCode _tc_TAO_tc_PortableServer_POAManager_State ( + CORBA::tk_enum, + sizeof (_oc_PortableServer_POAManager_State), + (char *) &_oc_PortableServer_POAManager_State, + 0, + sizeof (PortableServer::POAManager::State) + ); + +::CORBA::TypeCode_ptr PortableServer::POAManager::_tc_State = + &_tc_TAO_tc_PortableServer_POAManager_State; + PortableServer::POAManager::POAManager (void) {} @@ -6618,6 +6667,120 @@ operator>>= ( #if (TAO_HAS_MINIMUM_POA == 0) +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_exception/any_op_cs.cpp:50 + +// Copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + const PortableServer::POAManager::AdapterInactive &_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert_copy ( + _tao_any, + PortableServer::POAManager::AdapterInactive::_tao_any_destructor, + PortableServer::POAManager::_tc_AdapterInactive, + _tao_elem + ); +} + +// Non-copying insertion. +void operator<<= ( + CORBA::Any &_tao_any, + PortableServer::POAManager::AdapterInactive *_tao_elem + ) +{ + TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::insert ( + _tao_any, + PortableServer::POAManager::AdapterInactive::_tao_any_destructor, + PortableServer::POAManager::_tc_AdapterInactive, + _tao_elem + ); +} + +// Extraction to non-const pointer (deprecated). +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + PortableServer::POAManager::AdapterInactive *&_tao_elem + ) +{ + return _tao_any >>= ACE_const_cast ( + const PortableServer::POAManager::AdapterInactive *&, + _tao_elem + ); +} + +// Extraction to const pointer. +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + const PortableServer::POAManager::AdapterInactive *&_tao_elem + ) +{ + return + TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::extract ( + _tao_any, + PortableServer::POAManager::AdapterInactive::_tao_any_destructor, + PortableServer::POAManager::_tc_AdapterInactive, + _tao_elem + ); +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Dual_Impl_T<PortableServer::POAManager::AdapterInactive>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + +// TAO_IDL - Generated from +// W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_enum/any_op_cs.cpp:52 + +void operator<<= ( + CORBA::Any &_tao_any, + PortableServer::POAManager::State _tao_elem + ) +{ + TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::insert ( + _tao_any, + PortableServer::POAManager::_tc_State, + _tao_elem + ); +} + +CORBA::Boolean operator>>= ( + const CORBA::Any &_tao_any, + PortableServer::POAManager::State &_tao_elem + ) +{ + return + TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::extract ( + _tao_any, + PortableServer::POAManager::_tc_State, + _tao_elem + ); +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::marshal_value (TAO_OutputCDR &) +{ + return 0; +} + +ACE_TEMPLATE_SPECIALIZATION +CORBA::Boolean +TAO::Any_Basic_Impl_T<PortableServer::POAManager::State>::demarshal_value (TAO_InputCDR &) +{ + return 0; +} + // TAO_IDL - Generated from // W:\ACE_wrappers\TAO\TAO_IDL\be\be_visitor_interface/any_op_cs.cpp:50 ACE_TEMPLATE_SPECIALIZATION diff --git a/TAO/tao/Typecode.cpp b/TAO/tao/Typecode.cpp index fe7c5362d03..5c02dc74dc2 100644 --- a/TAO/tao/Typecode.cpp +++ b/TAO/tao/Typecode.cpp @@ -3789,9 +3789,8 @@ operator>> (TAO_InputCDR &strm, CORBA::TCKind &_tao_enumval) #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION) -/*template class TAO_Pseudo_Object_Manager<CORBA::TypeCode, +template class TAO_Pseudo_Object_Manager<CORBA::TypeCode, CORBA::TypeCode_var>; -*/ template class ACE_Hash_Map_Entry<const char *, ACE_Unbounded_Queue<CORBA::Long> *>; @@ -3822,11 +3821,35 @@ template class TAO_Pseudo_Var_T<CORBA::TypeCode>; template class TAO_Pseudo_Out_T<CORBA::TypeCode, CORBA::TypeCode_var>; template class TAO::Objref_Traits<CORBA::TypeCode>; + template class TAO::Arg_Traits<CORBA::TypeCode>; -/*template class TAO::Object_Arg_Traits_T<CORBA::TypeCode_ptr, - CORBA::TypeCode_var, - CORBA::TypeCode_out>; -*/ +template class + TAO::Object_Arg_Traits_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var, + CORBA::TypeCode_out, + TAO::Objref_Traits<CORBA::TypeCode> >; +template class TAO::In_Object_Argument_T<CORBA::TypeCode_ptr>; +template class + TAO::Inout_Object_Argument_T<CORBA::TypeCode_ptr, + TAO::Objref_Traits<CORBA::TypeCode> >; +template class TAO::Out_Object_Argument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_out>; +template class TAO::Ret_Object_Argument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var>; + +template class TAO::SArg_Traits<CORBA::TypeCode>; +template class TAO::Object_SArg_Traits_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var, + CORBA::TypeCode_out>; +template class TAO::In_Object_SArgument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var>; +template class TAO::Inout_Object_SArgument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var>; +template class TAO::Out_Object_SArgument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var, + CORBA::TypeCode_out>; +template class TAO::Ret_Object_SArgument_T<CORBA::TypeCode_ptr, + CORBA::TypeCode_var>; #elif defined (ACE_HAS_TEMPLATE_INSTANTIATION_PRAGMA) @@ -3865,8 +3888,32 @@ template class TAO::Arg_Traits<CORBA::TypeCode>; #pragma instantiate TAO::Objref_Traits<CORBA::TypeCode> #pragma instantiate TAO::Arg_Traits<CORBA::TypeCode> -#pragma instantiate TAO::Object_Arg_Traits_T<CORBA::TypeCode_ptr, \ - CORBA::TypeCode_var, \ - CORBA::TypeCode_out> +#pragma instantiate \ + TAO::Object_Arg_Traits_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var, \ + CORBA::TypeCode_out, \ + TAO::Objref_Traits<CORBA::TypeCode> > +#pragma instantiate TAO::In_Object_Argument_T<CORBA::TypeCode_ptr> +#pragma instantiate \ + TAO::Inout_Object_Argument_T<CORBA::TypeCode_ptr, \ + TAO::Objref_Traits<CORBA::TypeCode> > +#pragma instantiate TAO::Out_Object_Argument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_out> +#pragma instantiate TAO::Ret_Object_Argument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var> + +#pragma instantiate TAO::SArg_Traits<CORBA::TypeCode> +#pragma instantiate TAO::Object_SArg_Traits_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var, \ + CORBA::TypeCode_out> +#pragma instantiate TAO::In_Object_SArgument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var> +#pragma instantiate TAO::Inout_Object_SArgument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var> +#pragma instantiate TAO::Out_Object_SArgument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var, \ + CORBA::TypeCode_out> +#pragma instantiate TAO::Ret_Object_SArgument_T<CORBA::TypeCode_ptr, \ + CORBA::TypeCode_var> #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ |