diff options
Diffstat (limited to 'TAO/tao/PortableServer/Var_Array_SArgument_T.cpp')
-rw-r--r-- | TAO/tao/PortableServer/Var_Array_SArgument_T.cpp | 71 |
1 files changed, 23 insertions, 48 deletions
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 06a9e5014a4..8be7c23ac34 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -11,14 +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_SArgument_T<S, - S_slice, - S_forany, +TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) { S_forany tmp (this->x_); @@ -27,14 +23,10 @@ TAO::In_Var_Array_SArgument_T<S, #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_SArgument_T<S, - S_slice, - S_forany, +TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { @@ -45,27 +37,19 @@ TAO::In_Var_Array_SArgument_T<S, // =========================================================== -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Inout_Var_Array_SArgument_T<S, - S_slice, - S_forany, +TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) { - return cdr << this->x_; + return cdr << S_forany (this->x_); } -template<typename S, - typename S_slice, - typename S_forany, +template<typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Inout_Var_Array_SArgument_T<S, - S_slice, - S_forany, +TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) { S_forany tmp (this->x_); @@ -74,31 +58,28 @@ TAO::Inout_Var_Array_SArgument_T<S, #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_SArgument_T<S, - S_slice, - S_forany, +TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (const_cast <S_slice *>(this->x_))); + this->Insert_Policy::any_insert ( + any, + S_forany (const_cast <typename S_forany::_slice_type *>(this->x_)) + ); } #endif /* TAO_HAS_INTERCEPTORS */ // ============================================================== -template<typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Out_Var_Array_SArgument_T<S_slice, - S_var, +TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -110,13 +91,11 @@ TAO::Out_Var_Array_SArgument_T<S_slice, #if TAO_HAS_INTERCEPTORS == 1 -template<typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, typename Insert_Policy> void -TAO::Out_Var_Array_SArgument_T<S_slice, - S_var, +TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const @@ -128,13 +107,11 @@ TAO::Out_Var_Array_SArgument_T<S_slice, // ============================================================ -template<typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, typename Insert_Policy> CORBA::Boolean -TAO::Ret_Var_Array_SArgument_T<S_slice, - S_var, +TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::marshal ( TAO_OutputCDR & cdr @@ -145,13 +122,11 @@ TAO::Ret_Var_Array_SArgument_T<S_slice, #if TAO_HAS_INTERCEPTORS == 1 -template<typename S_slice, - typename S_var, +template<typename S_var, typename S_forany, typename Insert_Policy> void -TAO::Ret_Var_Array_SArgument_T<S_slice, - S_var, +TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const |