diff options
| -rw-r--r-- | TAO/tao/Array_VarOut_T.cpp | 6 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.h | 66 | ||||
| -rw-r--r-- | TAO/tao/Array_VarOut_T.inl | 40 |
3 files changed, 56 insertions, 56 deletions
diff --git a/TAO/tao/Array_VarOut_T.cpp b/TAO/tao/Array_VarOut_T.cpp index 3ffc6f253a0..91a36bbec95 100644 --- a/TAO/tao/Array_VarOut_T.cpp +++ b/TAO/tao/Array_VarOut_T.cpp @@ -14,7 +14,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename array_traits> TAO_FixedArray_Var_T<array_traits> & -TAO_FixedArray_Var_T<array_traits>::operator= (slice_type * p) +TAO_FixedArray_Var_T<array_traits>::operator= (_slice_type * p) { // Is what we own the same that is being assigned to us? if (this->ptr_ != p) @@ -48,7 +48,7 @@ TAO_FixedArray_Var_T<array_traits>::operator= ( template<typename array_traits> TAO_VarArray_Var_T<array_traits> & -TAO_VarArray_Var_T<array_traits>::operator= (slice_type * p) +TAO_VarArray_Var_T<array_traits>::operator= (_slice_type * p) { // Is what we own the same that is being assigned to us? if (this->ptr_ != p) @@ -86,7 +86,7 @@ TAO_Array_Forany_T<array_traits>::_tao_any_destructor ( void * _tao_void_pointer ) { - slice_type * tmp = static_cast<slice_type *> (_tao_void_pointer); + _slice_type * tmp = static_cast<_slice_type *> (_tao_void_pointer); TAO::details::array_traits<array_traits>::free (tmp); } diff --git a/TAO/tao/Array_VarOut_T.h b/TAO/tao/Array_VarOut_T.h index 2c05bc2e25a..2d53f78dbe5 100644 --- a/TAO/tao/Array_VarOut_T.h +++ b/TAO/tao/Array_VarOut_T.h @@ -54,41 +54,41 @@ template<typename array_traits> class TAO_Array_Forany_T { public: - typedef typename array_traits::slice_type slice_type; + typedef typename array_traits::slice_type _slice_type; TAO_Array_Forany_T (void); - TAO_Array_Forany_T (slice_type *, CORBA::Boolean nocopy = false); + TAO_Array_Forany_T (_slice_type *, CORBA::Boolean nocopy = false); TAO_Array_Forany_T (const TAO_Array_Forany_T<array_traits> &); ~TAO_Array_Forany_T (void); static void _tao_any_destructor (void *); - TAO_Array_Forany_T & operator= (slice_type *); + TAO_Array_Forany_T & operator= (_slice_type *); TAO_Array_Forany_T & operator= (const TAO_Array_Forany_T<array_traits> &); - slice_type & operator[] (CORBA::ULong index); - const slice_type & operator[] (CORBA::ULong index) const; + _slice_type & operator[] (CORBA::ULong index); + const _slice_type & operator[] (CORBA::ULong index) const; - operator slice_type * const & () const; - operator slice_type *& (); + operator _slice_type * const & () const; + operator _slice_type *& (); - typedef const slice_type * _in_type; - typedef slice_type * _inout_type; - typedef slice_type * & _out_type; - typedef slice_type * _retn_type; - typedef slice_type *& _retn_arg_type; + typedef const _slice_type * _in_type; + typedef _slice_type * _inout_type; + typedef _slice_type * & _out_type; + typedef _slice_type * _retn_type; + typedef _slice_type *& _retn_arg_type; // in, inout, out, _retn _in_type in (void) const; _inout_type inout (void); _out_type out (void); _retn_type _retn (void); - slice_type * ptr (void) const; + _slice_type * ptr (void) const; CORBA::Boolean nocopy (void) const; - static slice_type * tao_alloc (void); + static _slice_type * tao_alloc (void); private: - slice_type * ptr_; + _slice_type * ptr_; CORBA::Boolean nocopy_; }; @@ -143,14 +143,14 @@ template<typename array_traits> class TAO_FixedArray_Var_T : public TAO_Array_Var_Base_T<array_traits> { public: - typedef typename array_traits::slice_type slice_type; + typedef typename array_traits::slice_type _slice_type; typedef typename array_traits::slice_type *_out_type; TAO_FixedArray_Var_T (void); - TAO_FixedArray_Var_T (slice_type *); + TAO_FixedArray_Var_T (_slice_type *); TAO_FixedArray_Var_T (const TAO_FixedArray_Var_T<array_traits> &); - TAO_FixedArray_Var_T<array_traits> &operator= (slice_type *); + TAO_FixedArray_Var_T<array_traits> &operator= (_slice_type *); TAO_FixedArray_Var_T<array_traits> &operator= ( const TAO_FixedArray_Var_T<array_traits> & ); @@ -169,21 +169,21 @@ template<typename array_traits> class TAO_VarArray_Var_T : public TAO_Array_Var_Base_T<array_traits> { public: - typedef typename array_traits::slice_type slice_type; + typedef typename array_traits::slice_type _slice_type; typedef typename array_traits::slice_type *&_out_type; TAO_VarArray_Var_T (void); - TAO_VarArray_Var_T (slice_type *); + TAO_VarArray_Var_T (_slice_type *); TAO_VarArray_Var_T (const TAO_VarArray_Var_T<array_traits> &); - TAO_VarArray_Var_T<array_traits> &operator= (slice_type *); + TAO_VarArray_Var_T<array_traits> &operator= (_slice_type *); TAO_VarArray_Var_T<array_traits> &operator= ( const TAO_VarArray_Var_T<array_traits> & ); _out_type out (void); - operator slice_type *& (); + operator _slice_type *& (); }; /** @@ -196,28 +196,28 @@ template<typename array_traits> class TAO_Array_Out_T { public: - typedef typename array_traits::slice_type slice_type; - typedef typename array_traits::value_type value_type; + typedef typename array_traits::slice_type _slice_type; + typedef typename array_traits::value_type _value_type; - TAO_Array_Out_T (slice_type *&); - TAO_Array_Out_T (value_type &); + TAO_Array_Out_T (_slice_type *&); + TAO_Array_Out_T (_value_type &); TAO_Array_Out_T (const TAO_Array_Out_T<array_traits> &); TAO_Array_Out_T<array_traits> &operator= ( const TAO_Array_Out_T<array_traits> & ); - TAO_Array_Out_T<array_traits> &operator= (slice_type *); + TAO_Array_Out_T<array_traits> &operator= (_slice_type *); - operator slice_type *& (); - slice_type *& ptr (void); + operator _slice_type *& (); + _slice_type *& ptr (void); - slice_type & operator[] (CORBA::ULong index); - const slice_type & operator[] (CORBA::ULong index) const; + _slice_type & operator[] (CORBA::ULong index); + const _slice_type & operator[] (CORBA::ULong index) const; private: - slice_type *& ptr_; + _slice_type *& ptr_; // Assignment from T_var not allowed. - void operator= (const value_type &); + void operator= (const _value_type &); }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Array_VarOut_T.inl b/TAO/tao/Array_VarOut_T.inl index 44991eaab82..729add924d6 100644 --- a/TAO/tao/Array_VarOut_T.inl +++ b/TAO/tao/Array_VarOut_T.inl @@ -110,7 +110,7 @@ TAO_FixedArray_Var_T<array_traits>::TAO_FixedArray_Var_T (void) template<typename array_traits> ACE_INLINE -TAO_FixedArray_Var_T<array_traits>::TAO_FixedArray_Var_T (slice_type * p) +TAO_FixedArray_Var_T<array_traits>::TAO_FixedArray_Var_T (_slice_type * p) : TAO_Array_Var_Base_T<array_traits> (p) {} @@ -125,7 +125,7 @@ TAO_FixedArray_Var_T<array_traits>::TAO_FixedArray_Var_T ( template<typename array_traits> ACE_INLINE -typename TAO_FixedArray_Var_T<array_traits>::slice_type * +typename TAO_FixedArray_Var_T<array_traits>::_slice_type * TAO_FixedArray_Var_T<array_traits>::out (void) { return this->ptr_; @@ -140,7 +140,7 @@ TAO_VarArray_Var_T<array_traits>::TAO_VarArray_Var_T (void) template<typename array_traits> ACE_INLINE -TAO_VarArray_Var_T<array_traits>::TAO_VarArray_Var_T (slice_type * p) +TAO_VarArray_Var_T<array_traits>::TAO_VarArray_Var_T (_slice_type * p) : TAO_Array_Var_Base_T<array_traits> (p) {} @@ -154,14 +154,14 @@ TAO_VarArray_Var_T<array_traits>::TAO_VarArray_Var_T ( template<typename array_traits> ACE_INLINE -TAO_VarArray_Var_T<array_traits>::operator slice_type *& () +TAO_VarArray_Var_T<array_traits>::operator _slice_type *& () { return this->ptr_; } template<typename array_traits> ACE_INLINE -typename TAO_VarArray_Var_T<array_traits>::slice_type *& +typename TAO_VarArray_Var_T<array_traits>::_slice_type *& TAO_VarArray_Var_T<array_traits>::out (void) { TAO::details::array_traits<array_traits>::free (this->ptr_); @@ -173,7 +173,7 @@ TAO_VarArray_Var_T<array_traits>::out (void) template<typename array_traits> ACE_INLINE -TAO_Array_Out_T<array_traits>::TAO_Array_Out_T (slice_type *& p) +TAO_Array_Out_T<array_traits>::TAO_Array_Out_T (_slice_type *& p) : ptr_ (p) { this->ptr_ = 0; @@ -181,7 +181,7 @@ TAO_Array_Out_T<array_traits>::TAO_Array_Out_T (slice_type *& p) template<typename array_traits> ACE_INLINE -TAO_Array_Out_T<array_traits>::TAO_Array_Out_T (value_type & p) +TAO_Array_Out_T<array_traits>::TAO_Array_Out_T (_value_type & p) : ptr_ (p.out ()) { TAO::details::array_traits<array_traits>::free (this->ptr_); @@ -210,7 +210,7 @@ TAO_Array_Out_T<array_traits>::operator= ( template<typename array_traits> ACE_INLINE TAO_Array_Out_T<array_traits> & -TAO_Array_Out_T<array_traits>::operator= (slice_type *p) +TAO_Array_Out_T<array_traits>::operator= (_slice_type *p) { this->ptr_ = p; return *this; @@ -218,14 +218,14 @@ TAO_Array_Out_T<array_traits>::operator= (slice_type *p) template<typename array_traits> ACE_INLINE -TAO_Array_Out_T<array_traits>::operator slice_type *& () +TAO_Array_Out_T<array_traits>::operator _slice_type *& () { return this->ptr_; } template<typename array_traits> ACE_INLINE -typename TAO_Array_Out_T<array_traits>::slice_type & +typename TAO_Array_Out_T<array_traits>::_slice_type & TAO_Array_Out_T<array_traits>::operator[] (CORBA::ULong index) { return this->ptr_[index]; @@ -233,7 +233,7 @@ TAO_Array_Out_T<array_traits>::operator[] (CORBA::ULong index) template<typename array_traits> ACE_INLINE -typename TAO_Array_Out_T<array_traits>::slice_type *& +typename TAO_Array_Out_T<array_traits>::_slice_type *& TAO_Array_Out_T<array_traits>::ptr (void) { return this->ptr_; @@ -251,7 +251,7 @@ TAO_Array_Forany_T<array_traits>::TAO_Array_Forany_T (void) template<typename array_traits> ACE_INLINE TAO_Array_Forany_T<array_traits>::TAO_Array_Forany_T ( - slice_type * p, + _slice_type * p, CORBA::Boolean nocopy ) : ptr_ (p), @@ -277,7 +277,7 @@ TAO_Array_Forany_T<array_traits>::~TAO_Array_Forany_T (void) template<typename array_traits> ACE_INLINE TAO_Array_Forany_T<array_traits> & -TAO_Array_Forany_T<array_traits>::operator= (slice_type * p) +TAO_Array_Forany_T<array_traits>::operator= (_slice_type * p) { this->ptr_ = p; return *this; @@ -297,30 +297,30 @@ TAO_Array_Forany_T<array_traits>::operator= ( template<typename array_traits> ACE_INLINE -TAO_Array_Forany_T<array_traits>::operator slice_type * const & () const +TAO_Array_Forany_T<array_traits>::operator _slice_type * const & () const { return this->ptr_; } template<typename array_traits> ACE_INLINE -TAO_Array_Forany_T<array_traits>::operator slice_type *& () +TAO_Array_Forany_T<array_traits>::operator _slice_type *& () { return this->ptr_; } template<typename array_traits> ACE_INLINE -const typename TAO_Array_Forany_T<array_traits>::slice_type & +const typename TAO_Array_Forany_T<array_traits>::_slice_type & TAO_Array_Forany_T<array_traits>::operator[] (CORBA::ULong index) const { - const slice_type & tmp = this->ptr_[index]; + const _slice_type & tmp = this->ptr_[index]; return tmp; } template<typename array_traits> ACE_INLINE -typename TAO_Array_Forany_T<array_traits>::slice_type & +typename TAO_Array_Forany_T<array_traits>::_slice_type & TAO_Array_Forany_T<array_traits>::operator[] (CORBA::ULong index) { return this->ptr_[index]; @@ -368,7 +368,7 @@ TAO_Array_Forany_T<array_traits>::nocopy (void) const template<typename array_traits> ACE_INLINE -typename TAO_Array_Forany_T<array_traits>::slice_type * +typename TAO_Array_Forany_T<array_traits>::_slice_type * TAO_Array_Forany_T<array_traits>::ptr (void) const { return this->ptr_; @@ -376,7 +376,7 @@ TAO_Array_Forany_T<array_traits>::ptr (void) const template<typename array_traits> ACE_INLINE -typename TAO_Array_Forany_T<array_traits>::slice_type * +typename TAO_Array_Forany_T<array_traits>::_slice_type * TAO_Array_Forany_T<array_traits>::tao_alloc (void) { return TAO::details::array_traits<array_traits>::alloc (); |