From 4608a99fd45d336b8fdd10d66b8d0de6252bf280 Mon Sep 17 00:00:00 2001 From: loewis Date: Thu, 17 Jun 1999 23:54:56 +0000 Subject: [PATCH] * stl_queue.h: Rename _M_c to c, and _M_comp to comp. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@27581 138bc75d-0d04-0410-961f-82ee72b054a4 --- libstdc++/stl/ChangeLog | 4 +++ libstdc++/stl/stl_queue.h | 82 +++++++++++++++++++++++------------------------ 2 files changed, 45 insertions(+), 41 deletions(-) diff --git a/libstdc++/stl/ChangeLog b/libstdc++/stl/ChangeLog index f23f4fb..e1651a9 100644 --- a/libstdc++/stl/ChangeLog +++ b/libstdc++/stl/ChangeLog @@ -1,3 +1,7 @@ +1999-06-18 Martin von Löwis + + * stl_queue.h: Rename _M_c to c, and _M_comp to comp. + 1999-05-17 Mark Kettenis * stl_config.h: Only define __STL_PTHREADS with GLIBC >= 2 for diff --git a/libstdc++/stl/stl_queue.h b/libstdc++/stl/stl_queue.h index 489cc4a..c1e2b69 100644 --- a/libstdc++/stl/stl_queue.h +++ b/libstdc++/stl/stl_queue.h @@ -49,33 +49,33 @@ public: typedef typename _Sequence::reference reference; typedef typename _Sequence::const_reference const_reference; protected: - _Sequence _M_c; + _Sequence c; public: - queue() : _M_c() {} - explicit queue(const _Sequence& __c) : _M_c(__c) {} - - bool empty() const { return _M_c.empty(); } - size_type size() const { return _M_c.size(); } - reference front() { return _M_c.front(); } - const_reference front() const { return _M_c.front(); } - reference back() { return _M_c.back(); } - const_reference back() const { return _M_c.back(); } - void push(const value_type& __x) { _M_c.push_back(__x); } - void pop() { _M_c.pop_front(); } + queue() : c() {} + explicit queue(const _Sequence& __c) : c(__c) {} + + bool empty() const { return c.empty(); } + size_type size() const { return c.size(); } + reference front() { return c.front(); } + const_reference front() const { return c.front(); } + reference back() { return c.back(); } + const_reference back() const { return c.back(); } + void push(const value_type& __x) { c.push_back(__x); } + void pop() { c.pop_front(); } }; template bool operator==(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y) { - return __x._M_c == __y._M_c; + return __x.c == __y.c; } template bool operator<(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y) { - return __x._M_c < __y._M_c; + return __x.c < __y.c; } #ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER @@ -125,69 +125,69 @@ public: typedef typename _Sequence::reference reference; typedef typename _Sequence::const_reference const_reference; protected: - _Sequence _M_c; - _Compare _M_comp; + _Sequence c; + _Compare comp; public: - priority_queue() : _M_c() {} - explicit priority_queue(const _Compare& __x) : _M_c(), _M_comp(__x) {} + priority_queue() : c() {} + explicit priority_queue(const _Compare& __x) : c(), comp(__x) {} priority_queue(const _Compare& __x, const _Sequence& __s) - : _M_c(__s), _M_comp(__x) - { make_heap(_M_c.begin(), _M_c.end(), _M_comp); } + : c(__s), comp(__x) + { make_heap(c.begin(), c.end(), comp); } #ifdef __STL_MEMBER_TEMPLATES template priority_queue(_InputIterator __first, _InputIterator __last) - : _M_c(__first, __last) { make_heap(_M_c.begin(), _M_c.end(), _M_comp); } + : c(__first, __last) { make_heap(c.begin(), c.end(), comp); } template priority_queue(_InputIterator __first, _InputIterator __last, const _Compare& __x) - : _M_c(__first, __last), _M_comp(__x) - { make_heap(_M_c.begin(), _M_c.end(), _M_comp); } + : c(__first, __last), comp(__x) + { make_heap(c.begin(), c.end(), comp); } template priority_queue(_InputIterator __first, _InputIterator __last, const _Compare& __x, const _Sequence& __s) - : _M_c(__s), _M_comp(__x) + : c(__s), comp(__x) { - _M_c.insert(_M_c.end(), __first, __last); - make_heap(_M_c.begin(), _M_c.end(), _M_comp); + c.insert(c.end(), __first, __last); + make_heap(c.begin(), c.end(), comp); } #else /* __STL_MEMBER_TEMPLATES */ priority_queue(const value_type* __first, const value_type* __last) - : _M_c(__first, __last) { make_heap(_M_c.begin(), _M_c.end(), _M_comp); } + : c(__first, __last) { make_heap(c.begin(), c.end(), comp); } priority_queue(const value_type* __first, const value_type* __last, const _Compare& __x) - : _M_c(__first, __last), _M_comp(__x) - { make_heap(_M_c.begin(), _M_c.end(), _M_comp); } + : c(__first, __last), comp(__x) + { make_heap(c.begin(), c.end(), comp); } priority_queue(const value_type* __first, const value_type* __last, const _Compare& __x, const _Sequence& __c) - : _M_c(__c), _M_comp(__x) + : c(__c), comp(__x) { - _M_c.insert(_M_c.end(), __first, __last); - make_heap(_M_c.begin(), _M_c.end(), _M_comp); + c.insert(c.end(), __first, __last); + make_heap(c.begin(), c.end(), comp); } #endif /* __STL_MEMBER_TEMPLATES */ - bool empty() const { return _M_c.empty(); } - size_type size() const { return _M_c.size(); } - const_reference top() const { return _M_c.front(); } + bool empty() const { return c.empty(); } + size_type size() const { return c.size(); } + const_reference top() const { return c.front(); } void push(const value_type& __x) { __STL_TRY { - _M_c.push_back(__x); - push_heap(_M_c.begin(), _M_c.end(), _M_comp); + c.push_back(__x); + push_heap(c.begin(), c.end(), comp); } - __STL_UNWIND(_M_c.clear()); + __STL_UNWIND(c.clear()); } void pop() { __STL_TRY { - pop_heap(_M_c.begin(), _M_c.end(), _M_comp); - _M_c.pop_back(); + pop_heap(c.begin(), c.end(), comp); + c.pop_back(); } - __STL_UNWIND(_M_c.clear()); + __STL_UNWIND(c.clear()); } }; -- 2.7.4