diff options
author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-19 14:51:36 +0000 |
---|---|---|
committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2006-06-19 14:51:36 +0000 |
commit | 061823f12de356c0e923beb28fa21892b8463dbd (patch) | |
tree | 27d566b86585b07ef0779a5f17a66d5fff4d2327 /TAO/tao/Var_Array_Argument_T.cpp | |
parent | d8f3fb3e01c05aaafd8f8527a014781feab8ea45 (diff) | |
download | ATCD-061823f12de356c0e923beb28fa21892b8463dbd.tar.gz |
ChangeLogTag: Mon Jun 19 14:49:25 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu>
Diffstat (limited to 'TAO/tao/Var_Array_Argument_T.cpp')
-rw-r--r-- | TAO/tao/Var_Array_Argument_T.cpp | 66 |
1 files changed, 21 insertions, 45 deletions
diff --git a/TAO/tao/Var_Array_Argument_T.cpp b/TAO/tao/Var_Array_Argument_T.cpp index e1ad6bdd0ae..5c34336b9e2 100644 --- a/TAO/tao/Var_Array_Argument_T.cpp +++ b/TAO/tao/Var_Array_Argument_T.cpp @@ -11,12 +11,10 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal ( +TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr ) { @@ -25,12 +23,10 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal ( #if TAO_HAS_INTERCEPTORS == 1 -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> void -TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value ( +TAO::In_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { this->Insert_Policy::any_insert (any, this->x_); @@ -40,24 +36,20 @@ TAO::In_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_valu // =========================================================== -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::marshal ( +TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::marshal ( TAO_OutputCDR & cdr ) { return cdr << this->x_; } -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal ( +TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr ) { @@ -66,12 +58,10 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::demarshal ( #if TAO_HAS_INTERCEPTORS == 1 -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> void -TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_value ( +TAO::Inout_Var_Array_Argument_T<S_forany,Insert_Policy>::interceptor_value ( CORBA::Any *any) const { this->Insert_Policy::any_insert (any, this->x_); @@ -81,19 +71,15 @@ TAO::Inout_Var_Array_Argument_T<S,S_slice,S_forany,Insert_Policy>::interceptor_v // ============================================================== -template<typename S, - typename S_slice, - typename S_var, - typename S_out, +template<typename S_out, typename S_forany, - typename S_tag, typename Insert_Policy> CORBA::Boolean -TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>::demarshal ( +TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr ) { - typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; + typedef TAO::Array_Traits<S_forany> ARRAY_TRAITS; ACE_ALLOCATOR_RETURN (this->x_, ARRAY_TRAITS::alloc (), 0); @@ -103,15 +89,11 @@ TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy #if TAO_HAS_INTERCEPTORS == 1 -template<typename S, - typename S_slice, - typename S_var, - typename S_out, +template<typename S_out, typename S_forany, - typename S_tag, typename Insert_Policy> void -TAO::Out_Var_Array_Argument_T<S,S_slice,S_var,S_out,S_forany,S_tag,Insert_Policy>:: +TAO::Out_Var_Array_Argument_T<S_out,S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { S_forany tmp (this->x_); @@ -122,19 +104,16 @@ interceptor_value (CORBA::Any *any) const // ============================================================ -template<typename S, - typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, - typename S_tag, typename Insert_Policy> CORBA::Boolean -TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::demarshal ( +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>::demarshal ( TAO_InputCDR & cdr ) { - typedef TAO::Array_Traits<S,S_slice,S_tag> ARRAY_TRAITS; - S_slice * tmp_ptr = 0; + typedef TAO::Array_Traits<S_forany> ARRAY_TRAITS; + typename S_forany::_slice_type * tmp_ptr = 0; ACE_ALLOCATOR_RETURN (tmp_ptr, ARRAY_TRAITS::alloc (), 0); @@ -145,14 +124,11 @@ TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>::dem #if TAO_HAS_INTERCEPTORS == 1 -template<typename S, - typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, - typename S_tag, typename Insert_Policy> void -TAO::Ret_Var_Array_Argument_T<S,S_slice,S_var,S_forany,S_tag,Insert_Policy>:: +TAO::Ret_Var_Array_Argument_T<S_var,S_forany,Insert_Policy>:: interceptor_value (CORBA::Any *any) const { this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); |