* stl_queue.h: Rename _M_c to c, and _M_comp to comp.
From-SVN: r27581
This commit is contained in:
parent
37b454bd0b
commit
8afbe9226d
|
@ -1,3 +1,7 @@
|
||||||
|
1999-06-18 Martin von Löwis <loewis@informatik.hu-berlin.de>
|
||||||
|
|
||||||
|
* stl_queue.h: Rename _M_c to c, and _M_comp to comp.
|
||||||
|
|
||||||
1999-05-17 Mark Kettenis <kettenis@gnu.org>
|
1999-05-17 Mark Kettenis <kettenis@gnu.org>
|
||||||
|
|
||||||
* stl_config.h: Only define __STL_PTHREADS with GLIBC >= 2 for
|
* stl_config.h: Only define __STL_PTHREADS with GLIBC >= 2 for
|
||||||
|
|
|
@ -49,33 +49,33 @@ public:
|
||||||
typedef typename _Sequence::reference reference;
|
typedef typename _Sequence::reference reference;
|
||||||
typedef typename _Sequence::const_reference const_reference;
|
typedef typename _Sequence::const_reference const_reference;
|
||||||
protected:
|
protected:
|
||||||
_Sequence _M_c;
|
_Sequence c;
|
||||||
public:
|
public:
|
||||||
queue() : _M_c() {}
|
queue() : c() {}
|
||||||
explicit queue(const _Sequence& __c) : _M_c(__c) {}
|
explicit queue(const _Sequence& __c) : c(__c) {}
|
||||||
|
|
||||||
bool empty() const { return _M_c.empty(); }
|
bool empty() const { return c.empty(); }
|
||||||
size_type size() const { return _M_c.size(); }
|
size_type size() const { return c.size(); }
|
||||||
reference front() { return _M_c.front(); }
|
reference front() { return c.front(); }
|
||||||
const_reference front() const { return _M_c.front(); }
|
const_reference front() const { return c.front(); }
|
||||||
reference back() { return _M_c.back(); }
|
reference back() { return c.back(); }
|
||||||
const_reference back() const { return _M_c.back(); }
|
const_reference back() const { return c.back(); }
|
||||||
void push(const value_type& __x) { _M_c.push_back(__x); }
|
void push(const value_type& __x) { c.push_back(__x); }
|
||||||
void pop() { _M_c.pop_front(); }
|
void pop() { c.pop_front(); }
|
||||||
};
|
};
|
||||||
|
|
||||||
template <class _Tp, class _Sequence>
|
template <class _Tp, class _Sequence>
|
||||||
bool
|
bool
|
||||||
operator==(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y)
|
operator==(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y)
|
||||||
{
|
{
|
||||||
return __x._M_c == __y._M_c;
|
return __x.c == __y.c;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <class _Tp, class _Sequence>
|
template <class _Tp, class _Sequence>
|
||||||
bool
|
bool
|
||||||
operator<(const queue<_Tp, _Sequence>& __x, const queue<_Tp, _Sequence>& __y)
|
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
|
#ifdef __STL_FUNCTION_TMPL_PARTIAL_ORDER
|
||||||
|
@ -125,69 +125,69 @@ public:
|
||||||
typedef typename _Sequence::reference reference;
|
typedef typename _Sequence::reference reference;
|
||||||
typedef typename _Sequence::const_reference const_reference;
|
typedef typename _Sequence::const_reference const_reference;
|
||||||
protected:
|
protected:
|
||||||
_Sequence _M_c;
|
_Sequence c;
|
||||||
_Compare _M_comp;
|
_Compare comp;
|
||||||
public:
|
public:
|
||||||
priority_queue() : _M_c() {}
|
priority_queue() : c() {}
|
||||||
explicit priority_queue(const _Compare& __x) : _M_c(), _M_comp(__x) {}
|
explicit priority_queue(const _Compare& __x) : c(), comp(__x) {}
|
||||||
priority_queue(const _Compare& __x, const _Sequence& __s)
|
priority_queue(const _Compare& __x, const _Sequence& __s)
|
||||||
: _M_c(__s), _M_comp(__x)
|
: c(__s), comp(__x)
|
||||||
{ make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
|
{ make_heap(c.begin(), c.end(), comp); }
|
||||||
|
|
||||||
#ifdef __STL_MEMBER_TEMPLATES
|
#ifdef __STL_MEMBER_TEMPLATES
|
||||||
template <class _InputIterator>
|
template <class _InputIterator>
|
||||||
priority_queue(_InputIterator __first, _InputIterator __last)
|
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 <class _InputIterator>
|
template <class _InputIterator>
|
||||||
priority_queue(_InputIterator __first,
|
priority_queue(_InputIterator __first,
|
||||||
_InputIterator __last, const _Compare& __x)
|
_InputIterator __last, const _Compare& __x)
|
||||||
: _M_c(__first, __last), _M_comp(__x)
|
: c(__first, __last), comp(__x)
|
||||||
{ make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
|
{ make_heap(c.begin(), c.end(), comp); }
|
||||||
|
|
||||||
template <class _InputIterator>
|
template <class _InputIterator>
|
||||||
priority_queue(_InputIterator __first, _InputIterator __last,
|
priority_queue(_InputIterator __first, _InputIterator __last,
|
||||||
const _Compare& __x, const _Sequence& __s)
|
const _Compare& __x, const _Sequence& __s)
|
||||||
: _M_c(__s), _M_comp(__x)
|
: c(__s), comp(__x)
|
||||||
{
|
{
|
||||||
_M_c.insert(_M_c.end(), __first, __last);
|
c.insert(c.end(), __first, __last);
|
||||||
make_heap(_M_c.begin(), _M_c.end(), _M_comp);
|
make_heap(c.begin(), c.end(), comp);
|
||||||
}
|
}
|
||||||
|
|
||||||
#else /* __STL_MEMBER_TEMPLATES */
|
#else /* __STL_MEMBER_TEMPLATES */
|
||||||
priority_queue(const value_type* __first, const value_type* __last)
|
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,
|
priority_queue(const value_type* __first, const value_type* __last,
|
||||||
const _Compare& __x)
|
const _Compare& __x)
|
||||||
: _M_c(__first, __last), _M_comp(__x)
|
: c(__first, __last), comp(__x)
|
||||||
{ make_heap(_M_c.begin(), _M_c.end(), _M_comp); }
|
{ make_heap(c.begin(), c.end(), comp); }
|
||||||
|
|
||||||
priority_queue(const value_type* __first, const value_type* __last,
|
priority_queue(const value_type* __first, const value_type* __last,
|
||||||
const _Compare& __x, const _Sequence& __c)
|
const _Compare& __x, const _Sequence& __c)
|
||||||
: _M_c(__c), _M_comp(__x)
|
: c(__c), comp(__x)
|
||||||
{
|
{
|
||||||
_M_c.insert(_M_c.end(), __first, __last);
|
c.insert(c.end(), __first, __last);
|
||||||
make_heap(_M_c.begin(), _M_c.end(), _M_comp);
|
make_heap(c.begin(), c.end(), comp);
|
||||||
}
|
}
|
||||||
#endif /* __STL_MEMBER_TEMPLATES */
|
#endif /* __STL_MEMBER_TEMPLATES */
|
||||||
|
|
||||||
bool empty() const { return _M_c.empty(); }
|
bool empty() const { return c.empty(); }
|
||||||
size_type size() const { return _M_c.size(); }
|
size_type size() const { return c.size(); }
|
||||||
const_reference top() const { return _M_c.front(); }
|
const_reference top() const { return c.front(); }
|
||||||
void push(const value_type& __x) {
|
void push(const value_type& __x) {
|
||||||
__STL_TRY {
|
__STL_TRY {
|
||||||
_M_c.push_back(__x);
|
c.push_back(__x);
|
||||||
push_heap(_M_c.begin(), _M_c.end(), _M_comp);
|
push_heap(c.begin(), c.end(), comp);
|
||||||
}
|
}
|
||||||
__STL_UNWIND(_M_c.clear());
|
__STL_UNWIND(c.clear());
|
||||||
}
|
}
|
||||||
void pop() {
|
void pop() {
|
||||||
__STL_TRY {
|
__STL_TRY {
|
||||||
pop_heap(_M_c.begin(), _M_c.end(), _M_comp);
|
pop_heap(c.begin(), c.end(), comp);
|
||||||
_M_c.pop_back();
|
c.pop_back();
|
||||||
}
|
}
|
||||||
__STL_UNWIND(_M_c.clear());
|
__STL_UNWIND(c.clear());
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue