diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-20 07:33:02 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-06-20 07:33:02 +0000 |
| commit | dd02662ca476b78c0fe131b20854ad953de9805d (patch) | |
| tree | 2af11857d3f420b17c192509872ca944090df2ae /TAO/tao/PortableServer/Var_Array_SArgument_T.cpp | |
| parent | acb447b0fa8985b7010af7f1f1dd172fcff4f11d (diff) | |
| download | ATCD-dd02662ca476b78c0fe131b20854ad953de9805d.tar.gz | |
ChangeLogTag: Tue Jun 20 07:04:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'TAO/tao/PortableServer/Var_Array_SArgument_T.cpp')
| -rw-r--r-- | TAO/tao/PortableServer/Var_Array_SArgument_T.cpp | 43 |
1 files changed, 34 insertions, 9 deletions
diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 8be7c23ac34..fa597cd3884 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -12,7 +12,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -24,21 +24,28 @@ TAO::In_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 template<typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::In_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_)); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_)); } #endif /* TAO_HAS_INTERCEPTORS */ // =========================================================== +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::marshal (TAO_OutputCDR &cdr) @@ -46,8 +53,15 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, return cdr << S_forany (this->x_); } +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 CORBA::Boolean TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::demarshal (TAO_InputCDR & cdr) @@ -58,17 +72,28 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, #if TAO_HAS_INTERCEPTORS == 1 +<<<<<<< Var_Array_SArgument_T.cpp +template<typename S, + typename S_slice, + typename S_forany, + template <typename> class Insert_Policy> +======= template<typename S_forany, typename Insert_Policy> +>>>>>>> 1.9 void TAO::Inout_Var_Array_SArgument_T<S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { +<<<<<<< Var_Array_SArgument_T.cpp + Insert_Policy<S_forany>::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_)) ); +>>>>>>> 1.9 } #endif /* TAO_HAS_INTERCEPTORS */ @@ -77,7 +102,7 @@ TAO::Inout_Var_Array_SArgument_T<S_forany, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Out_Var_Array_SArgument_T<S_var, S_forany, @@ -93,14 +118,14 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Out_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ @@ -109,7 +134,7 @@ TAO::Out_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> CORBA::Boolean TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, @@ -124,14 +149,14 @@ TAO::Ret_Var_Array_SArgument_T<S_var, template<typename S_var, typename S_forany, - typename Insert_Policy> + template <typename> class Insert_Policy> void TAO::Ret_Var_Array_SArgument_T<S_var, S_forany, Insert_Policy>::interceptor_value ( CORBA::Any *any) const { - this->Insert_Policy::any_insert (any, S_forany (this->x_.ptr ())); + Insert_Policy<S_forany>::any_insert (any, S_forany (this->x_.ptr ())); } #endif /* TAO_HAS_INTERCEPTORS */ |