diff options
| author | Paolo Carlini <pcarlini@unitus.it> | 2001-12-31 11:26:01 +0100 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2001-12-31 10:26:01 +0000 |
| commit | 63fea34ee3fec5b5cb65898d8c448a69a9ee38ee (patch) | |
| tree | d6ae257df07199541df034ee856082da9dd3c4f4 | |
| parent | e538847e1c56a0d6a8bbdea61d70a81bf958e78d (diff) | |
| download | gcc-63fea34ee3fec5b5cb65898d8c448a69a9ee38ee.zip gcc-63fea34ee3fec5b5cb65898d8c448a69a9ee38ee.tar.gz gcc-63fea34ee3fec5b5cb65898d8c448a69a9ee38ee.tar.bz2 | |
slist: Move into __gnu_cxx, tweak, add using declarations.
2001-12-31 Paolo Carlini <pcarlini@unitus.it>
* include/ext/slist: Move into __gnu_cxx,
tweak, add using declarations.
From-SVN: r48423
| -rw-r--r-- | libstdc++-v3/ChangeLog | 5 | ||||
| -rw-r--r-- | libstdc++-v3/include/ext/slist | 30 |
2 files changed, 25 insertions, 10 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1548e7e..420b7cd 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,10 @@ 2001-12-31 Paolo Carlini <pcarlini@unitus.it> + * include/ext/slist: Move into __gnu_cxx, + tweak, add using declarations. + +2001-12-31 Paolo Carlini <pcarlini@unitus.it> + * include/ext/hash_map: Move into __gnu_cxx, tweak, add using declarations. * include/ext/hash_set: Ditto. diff --git a/libstdc++-v3/include/ext/slist b/libstdc++-v3/include/ext/slist index 7ed4c31..0863a8c 100644 --- a/libstdc++-v3/include/ext/slist +++ b/libstdc++-v3/include/ext/slist @@ -55,8 +55,14 @@ #include <bits/stl_uninitialized.h> #include <bits/concept_check.h> -namespace std +namespace __gnu_cxx { +using std::size_t; +using std::ptrdiff_t; +using std::_Alloc_traits; +using std::_Construct; +using std::_Destroy; +using std::allocator; struct _Slist_node_base { @@ -145,9 +151,9 @@ struct _Slist_node : public _Slist_node_base struct _Slist_iterator_base { - typedef size_t size_type; - typedef ptrdiff_t difference_type; - typedef forward_iterator_tag iterator_category; + typedef size_t size_type; + typedef ptrdiff_t difference_type; + typedef std::forward_iterator_tag iterator_category; _Slist_node_base* _M_node; @@ -297,7 +303,7 @@ class slist : private _Slist_base<_Tp,_Alloc> private: typedef _Slist_base<_Tp,_Alloc> _Base; public: - typedef _Tp value_type; + typedef _Tp value_type; typedef value_type* pointer; typedef const value_type* const_pointer; typedef value_type& reference; @@ -707,8 +713,8 @@ template <class _Tp, class _Alloc> inline bool operator<(const slist<_Tp,_Alloc>& _SL1, const slist<_Tp,_Alloc>& _SL2) { - return lexicographical_compare(_SL1.begin(), _SL1.end(), - _SL2.begin(), _SL2.end()); + return std::lexicographical_compare(_SL1.begin(), _SL1.end(), + _SL2.begin(), _SL2.end()); } template <class _Tp, class _Alloc> @@ -897,13 +903,17 @@ void slist<_Tp,_Alloc>::sort(_StrictWeakOrdering __comp) } } +} // namespace __gnu_cxx + +namespace std +{ // Specialization of insert_iterator so that insertions will be constant // time rather than linear time. template <class _Tp, class _Alloc> -class insert_iterator<slist<_Tp, _Alloc> > { +class insert_iterator<__gnu_cxx::slist<_Tp, _Alloc> > { protected: - typedef slist<_Tp, _Alloc> _Container; + typedef __gnu_cxx::slist<_Tp, _Alloc> _Container; _Container* container; typename _Container::iterator iter; public: @@ -932,7 +942,7 @@ public: insert_iterator<_Container>& operator++(int) { return *this; } }; -} // namespace std +} // namespace std #endif /* __SGI_STL_INTERNAL_SLIST_H */ |