diff options
Diffstat (limited to 'TAO/tao/Array_VarOut_T.cpp')
| -rw-r--r-- | TAO/tao/Array_VarOut_T.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index b9058fedc07..90841d0d445 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -13,33 +13,33 @@ ACE_RCSID (tao, Array_VarOut_T, "$Id$") -template<typename T_slice, typename T_life> -TAO_FixedArray_Var_T<T_slice,T_life> & -TAO_FixedArray_Var_T<T_slice,T_life>::operator= (T_slice * p) +template<typename T, typename T_slice, typename T_life> +TAO_FixedArray_Var_T<T,T_slice,T_life> & +TAO_FixedArray_Var_T<T,T_slice,T_life>::operator= (T_slice * p) { // Is what we own the same that is being assigned to us? if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - T_life::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice>::tao_free (this->ptr_); this->ptr_ = p; } return *this; } -template<typename T_slice, typename T_life> -TAO_FixedArray_Var_T<T_slice,T_life> & -TAO_FixedArray_Var_T<T_slice,T_life>::operator= ( - const TAO_FixedArray_Var_T<T_slice,T_life> & p +template<typename T, typename T_slice, typename T_life> +TAO_FixedArray_Var_T<T,T_slice,T_life> & +TAO_FixedArray_Var_T<T,T_slice,T_life>::operator= ( + const TAO_FixedArray_Var_T<T,T_slice,T_life> & p ) { if (this != &p) { - T_life::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice>::tao_free (this->ptr_); // Deep copy. - this->ptr_ = T_life::tao_dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice>::tao_dup (p.in ()); } return *this; @@ -47,33 +47,33 @@ TAO_FixedArray_Var_T<T_slice,T_life>::operator= ( // ************************************************************* -template<typename T_slice, typename T_life> -TAO_VarArray_Var_T<T_slice,T_life> & -TAO_VarArray_Var_T<T_slice,T_life>::operator= (T_slice * p) +template<typename T, typename T_slice, typename T_life> +TAO_VarArray_Var_T<T,T_slice,T_life> & +TAO_VarArray_Var_T<T,T_slice,T_life>::operator= (T_slice * p) { // Is what we own the same that is being assigned to us? if (this->ptr_ != p) { // Delete our stuff and assume ownership of p. - T_life::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice>::tao_free (this->ptr_); this->ptr_ = p; } return *this; } -template<typename T_slice, typename T_life> -TAO_VarArray_Var_T<T_slice,T_life> & -TAO_VarArray_Var_T<T_slice,T_life>::operator= ( - const TAO_VarArray_Var_T<T_slice,T_life> & p +template<typename T, typename T_slice, typename T_life> +TAO_VarArray_Var_T<T,T_slice,T_life> & +TAO_VarArray_Var_T<T,T_slice,T_life>::operator= ( + const TAO_VarArray_Var_T<T,T_slice,T_life> & p ) { if (this != &p) { - T_life::tao_free (this->ptr_); + TAO::Array_Traits<T,T_slice>::tao_free (this->ptr_); // Deep copy. - this->ptr_ = T_life::tao_dup (p.in ()); + this->ptr_ = TAO::Array_Traits<T,T_slice>::tao_dup (p.in ()); } return *this; @@ -81,14 +81,14 @@ TAO_VarArray_Var_T<T_slice,T_life>::operator= ( // ************************************************************* -template<typename T_slice, typename T_life> +template<typename T, typename T_slice, typename T_life> void -TAO_Array_Forany_T<T_slice,T_life>::_tao_any_destructor ( +TAO_Array_Forany_T<T,T_slice,T_life>::_tao_any_destructor ( void * _tao_void_pointer ) { T_slice * tmp = ACE_static_cast (T_slice *, _tao_void_pointer); - T_life::tao_free (tmp); + TAO::Array_Traits<T,T_slice>::tao_free (tmp); } #endif /* TAO_ARRAY_VAROUT_T_C */ |