Commit 5b5bf717 by Paolo Carlini Committed by Paolo Carlini

deque.tcc: Fully qualify standard functions with std::, thus avoiding Koenig lookup.

2003-07-04  Paolo Carlini  <pcarlini@unitus.it>

	* include/bits/deque.tcc: Fully qualify standard
	functions with std::, thus avoiding Koenig lookup.
	* include/bits/gslice_array.h: Likewise.
	* include/bits/indirect_array.h: Likewise.
	* include/bits/list.tcc: Likewise.
	* include/bits/mask_array.h: Likewise.
	* include/bits/slice_array.h: Likewise.

From-SVN: r68937
parent 7f6dd1ca
2003-07-04 Paolo Carlini <pcarlini@unitus.it>
* include/bits/deque.tcc: Fully qualify standard
functions with std::, thus avoiding Koenig lookup.
* include/bits/gslice_array.h: Likewise.
* include/bits/indirect_array.h: Likewise.
* include/bits/list.tcc: Likewise.
* include/bits/mask_array.h: Likewise.
* include/bits/slice_array.h: Likewise.
2003-07-04 Gawain Bolton <gbolton@free.fr> 2003-07-04 Gawain Bolton <gbolton@free.fr>
* include/bits/stl_tree.h: Performance and memory usage * include/bits/stl_tree.h: Performance and memory usage
......
...@@ -116,16 +116,16 @@ namespace std { ...@@ -116,16 +116,16 @@ namespace std {
inline void inline void
gslice_array<_Tp>::operator=(const _Tp& __t) const gslice_array<_Tp>::operator=(const _Tp& __t) const
{ {
__valarray_fill(_M_array, _Array<size_t>(_M_index), std::__valarray_fill(_M_array, _Array<size_t>(_M_index),
_M_index.size(), __t); _M_index.size(), __t);
} }
template<typename _Tp> template<typename _Tp>
inline void inline void
gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const gslice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ {
__valarray_copy(_Array<_Tp>(__v), __v.size(), std::__valarray_copy(_Array<_Tp>(__v), __v.size(),
_M_array, _Array<size_t>(_M_index)); _M_array, _Array<size_t>(_M_index));
} }
template<typename _Tp> template<typename _Tp>
...@@ -133,8 +133,8 @@ namespace std { ...@@ -133,8 +133,8 @@ namespace std {
inline void inline void
gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const gslice_array<_Tp>::operator=(const _Expr<_Dom, _Tp>& __e) const
{ {
__valarray_copy (__e, _M_index.size(), _M_array, std::__valarray_copy (__e, _M_index.size(), _M_array,
_Array<size_t>(_M_index)); _Array<size_t>(_M_index));
} }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
......
...@@ -118,7 +118,7 @@ namespace std ...@@ -118,7 +118,7 @@ namespace std
inline indirect_array<_Tp>& inline indirect_array<_Tp>&
indirect_array<_Tp>::operator=(const indirect_array<_Tp>& __a) indirect_array<_Tp>::operator=(const indirect_array<_Tp>& __a)
{ {
__valarray_copy(__a._M_array, _M_sz, __a._M_index, _M_array, _M_index); std::__valarray_copy(__a._M_array, _M_sz, __a._M_index, _M_array, _M_index);
return *this; return *this;
} }
...@@ -126,18 +126,18 @@ namespace std ...@@ -126,18 +126,18 @@ namespace std
template<typename _Tp> template<typename _Tp>
inline void inline void
indirect_array<_Tp>::operator=(const _Tp& __t) const indirect_array<_Tp>::operator=(const _Tp& __t) const
{ __valarray_fill(_M_array, _M_index, _M_sz, __t); } { std::__valarray_fill(_M_array, _M_index, _M_sz, __t); }
template<typename _Tp> template<typename _Tp>
inline void inline void
indirect_array<_Tp>::operator=(const valarray<_Tp>& __v) const indirect_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy(_Array<_Tp>(__v), _M_sz, _M_array, _M_index); } { std::__valarray_copy(_Array<_Tp>(__v), _M_sz, _M_array, _M_index); }
template<typename _Tp> template<typename _Tp>
template<class _Dom> template<class _Dom>
inline void inline void
indirect_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const indirect_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
{ __valarray_copy(__e, _M_sz, _M_array, _M_index); } { std::__valarray_copy(__e, _M_sz, _M_array, _M_index); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
......
...@@ -74,7 +74,7 @@ namespace std ...@@ -74,7 +74,7 @@ namespace std
{ {
_Node* __tmp = __cur; _Node* __tmp = __cur;
__cur = static_cast<_Node*>(__cur->_M_next); __cur = static_cast<_Node*>(__cur->_M_next);
_Destroy(&__tmp->_M_data); std::_Destroy(&__tmp->_M_data);
_M_put_node(__tmp); _M_put_node(__tmp);
} }
this->_M_node->_M_next = this->_M_node; this->_M_node->_M_next = this->_M_node;
...@@ -104,7 +104,7 @@ namespace std ...@@ -104,7 +104,7 @@ namespace std
_Node* __n = static_cast<_Node*>(__position._M_node); _Node* __n = static_cast<_Node*>(__position._M_node);
__prev_node->_M_next = __next_node; __prev_node->_M_next = __next_node;
__next_node->_M_prev = __prev_node; __next_node->_M_prev = __prev_node;
_Destroy(&__n->_M_data); std::_Destroy(&__n->_M_data);
_M_put_node(__n); _M_put_node(__n);
return iterator(static_cast<_Node*>(__next_node)); return iterator(static_cast<_Node*>(__next_node));
} }
......
...@@ -114,18 +114,18 @@ namespace std { ...@@ -114,18 +114,18 @@ namespace std {
template<typename _Tp> template<typename _Tp>
inline void inline void
mask_array<_Tp>::operator=(const _Tp& __t) const mask_array<_Tp>::operator=(const _Tp& __t) const
{ __valarray_fill(_M_array, _M_sz, _M_mask, __t); } { std::__valarray_fill(_M_array, _M_sz, _M_mask, __t); }
template<typename _Tp> template<typename _Tp>
inline void inline void
mask_array<_Tp>::operator=(const valarray<_Tp>& __v) const mask_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy(_Array<_Tp>(__v), __v.size(), _M_array, _M_mask); } { std::__valarray_copy(_Array<_Tp>(__v), __v.size(), _M_array, _M_mask); }
template<typename _Tp> template<typename _Tp>
template<class _Ex> template<class _Ex>
inline void inline void
mask_array<_Tp>::operator=(const _Expr<_Ex, _Tp>& __e) const mask_array<_Tp>::operator=(const _Expr<_Ex, _Tp>& __e) const
{ __valarray_copy(__e, __e.size(), _M_array, _M_mask); } { std::__valarray_copy(__e, __e.size(), _M_array, _M_mask); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op, _Name) \
......
...@@ -157,26 +157,26 @@ namespace std ...@@ -157,26 +157,26 @@ namespace std
inline slice_array<_Tp>& inline slice_array<_Tp>&
slice_array<_Tp>::operator=(const slice_array<_Tp>& __a) slice_array<_Tp>::operator=(const slice_array<_Tp>& __a)
{ {
__valarray_copy(__a._M_array, __a._M_sz, __a._M_stride, std::__valarray_copy(__a._M_array, __a._M_sz, __a._M_stride,
_M_array, _M_stride); _M_array, _M_stride);
return *this; return *this;
} }
template<typename _Tp> template<typename _Tp>
inline void inline void
slice_array<_Tp>::operator=(const _Tp& __t) const slice_array<_Tp>::operator=(const _Tp& __t) const
{ __valarray_fill(_M_array, _M_sz, _M_stride, __t); } { std::__valarray_fill(_M_array, _M_sz, _M_stride, __t); }
template<typename _Tp> template<typename _Tp>
inline void inline void
slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const slice_array<_Tp>::operator=(const valarray<_Tp>& __v) const
{ __valarray_copy(_Array<_Tp>(__v), _M_array, _M_sz, _M_stride); } { std::__valarray_copy(_Array<_Tp>(__v), _M_array, _M_sz, _M_stride); }
template<typename _Tp> template<typename _Tp>
template<class _Dom> template<class _Dom>
inline void inline void
slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const slice_array<_Tp>::operator=(const _Expr<_Dom,_Tp>& __e) const
{ __valarray_copy(__e, _M_sz, _M_array, _M_stride); } { std::__valarray_copy(__e, _M_sz, _M_array, _M_stride); }
#undef _DEFINE_VALARRAY_OPERATOR #undef _DEFINE_VALARRAY_OPERATOR
#define _DEFINE_VALARRAY_OPERATOR(_Op,_Name) \ #define _DEFINE_VALARRAY_OPERATOR(_Op,_Name) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment