diff options
| author | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-05 14:06:13 +0000 |
|---|---|---|
| committer | paolo <paolo@138bc75d-0d04-0410-961f-82ee72b054a4> | 2009-11-05 14:06:13 +0000 |
| commit | 1bf7a84d9d07d5c3dbc40fd202c25fedae926451 (patch) | |
| tree | 0184fef88c6c0ad06f8bbbe30c7eb876d0a8d394 /libstdc++-v3/include/parallel/losertree.h | |
| parent | 5021761179f2c1d44bcea22d8cb7b6e71f83b855 (diff) | |
| download | ppe42-gcc-1bf7a84d9d07d5c3dbc40fd202c25fedae926451.tar.gz ppe42-gcc-1bf7a84d9d07d5c3dbc40fd202c25fedae926451.zip | |
2009-11-05 Paolo Carlini <paolo.carlini@oracle.com>
* include/parallel/multiway_merge.h: Simple formatting and
uglification fixes.
* include/parallel/losertree.h: Likewise.
* include/parallel/base.h: Likewise.
* include/parallel/par_loop.h: Likewise.
* include/parallel/omp_loop_static.h: Likewise.
* include/parallel/multiway_mergesort.h: Likewise.
* include/parallel/partial_sum.h: Likewise.
* include/parallel/omp_loop.h: Likewise.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@153939 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/include/parallel/losertree.h')
| -rw-r--r-- | libstdc++-v3/include/parallel/losertree.h | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/libstdc++-v3/include/parallel/losertree.h b/libstdc++-v3/include/parallel/losertree.h index f83333bcb2f..9b9914ff1f0 100644 --- a/libstdc++-v3/include/parallel/losertree.h +++ b/libstdc++-v3/include/parallel/losertree.h @@ -163,7 +163,8 @@ template<typename _Tp, typename _Compare> */ template<bool __stable/* default == true */, typename _Tp, typename _Compare> - class _LoserTree : public _LoserTreeBase<_Tp, _Compare> + class _LoserTree + : public _LoserTreeBase<_Tp, _Compare> { typedef _LoserTreeBase<_Tp, _Compare> _Base; using _Base::_M_k; @@ -797,7 +798,7 @@ public: * run empty. This is a very fast variant. */ template<typename _Tp, typename _Compare> - class LoserTreePointerUnguardedBase + class _LoserTreePointerUnguardedBase { protected: struct _Loser @@ -812,8 +813,8 @@ template<typename _Tp, typename _Compare> public: - LoserTreePointerUnguardedBase(unsigned int __k, const _Tp& _sentinel, - _Compare __comp = std::less<_Tp>()) + _LoserTreePointerUnguardedBase(unsigned int __k, const _Tp& _sentinel, + _Compare __comp = std::less<_Tp>()) : _M_comp(__comp) { _M_ik = __k; @@ -831,7 +832,7 @@ template<typename _Tp, typename _Compare> } } - ~LoserTreePointerUnguardedBase() + ~_LoserTreePointerUnguardedBase() { delete[] _M_losers; } int @@ -861,16 +862,16 @@ template<typename _Tp, typename _Compare> */ template<bool __stable/* default == true */, typename _Tp, typename _Compare> class _LoserTreePointerUnguarded - : public LoserTreePointerUnguardedBase<_Tp, _Compare> + : public _LoserTreePointerUnguardedBase<_Tp, _Compare> { - typedef LoserTreePointerUnguardedBase<_Tp, _Compare> _Base; + typedef _LoserTreePointerUnguardedBase<_Tp, _Compare> _Base; using _Base::_M_k; using _Base::_M_losers; public: _LoserTreePointerUnguarded(unsigned int __k, const _Tp& _sentinel, _Compare __comp = std::less<_Tp>()) - : _Base::LoserTreePointerUnguardedBase(__k, _sentinel, __comp) + : _Base::_LoserTreePointerUnguardedBase(__k, _sentinel, __comp) { } unsigned int @@ -945,16 +946,16 @@ template<bool __stable/* default == true */, typename _Tp, typename _Compare> */ template<typename _Tp, typename _Compare> class _LoserTreePointerUnguarded</* __stable == */false, _Tp, _Compare> - : public LoserTreePointerUnguardedBase<_Tp, _Compare> + : public _LoserTreePointerUnguardedBase<_Tp, _Compare> { - typedef LoserTreePointerUnguardedBase<_Tp, _Compare> _Base; + typedef _LoserTreePointerUnguardedBase<_Tp, _Compare> _Base; using _Base::_M_k; using _Base::_M_losers; public: _LoserTreePointerUnguarded(unsigned int __k, const _Tp& _sentinel, _Compare __comp = std::less<_Tp>()) - : _Base::LoserTreePointerUnguardedBase(__k, _sentinel, __comp) + : _Base::_LoserTreePointerUnguardedBase(__k, _sentinel, __comp) { } unsigned int |
