diff options
| author | Chris Fairles <cfairles@gcc.gnu.org> | 2009-02-06 06:01:40 +0000 |
|---|---|---|
| committer | Chris Fairles <cfairles@gcc.gnu.org> | 2009-02-06 06:01:40 +0000 |
| commit | fe960d925789ffd66c24c3b2debf9c240d80eb24 (patch) | |
| tree | 336e6df3fc4da8190017dfc6c161d0dbb56168d8 /libstdc++-v3 | |
| parent | 6d39673dce04f511bc7e764a6773c2c5da6b0178 (diff) | |
| download | gcc-fe960d925789ffd66c24c3b2debf9c240d80eb24.zip gcc-fe960d925789ffd66c24c3b2debf9c240d80eb24.tar.gz gcc-fe960d925789ffd66c24c3b2debf9c240d80eb24.tar.bz2 | |
tuple (_Head_base<>::_Head_base(_UHead&&)): Formatting.
2009-02-05 Chris Fairles <cfairles@gcc.gnu.org>
* include/std/tuple (_Head_base<>::_Head_base(_UHead&&)): Formatting.
(_Head_base<>::__swap_impl): Rename to _M_swap_impl.
(_Tuple_impl<>::__swap_impl): Likewise and make protected to avoid
exposing it in public std::tuple interface.
From-SVN: r143979
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 26 |
2 files changed, 21 insertions, 12 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 341e94d..a54b4d8 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,4 +1,11 @@ 2009-02-05 Chris Fairles <cfairles@gcc.gnu.org> + + * include/std/tuple (_Head_base<>::_Head_base(_UHead&&)): Formatting. + (_Head_base<>::__swap_impl): Rename to _M_swap_impl. + (_Tuple_impl<>::__swap_impl): Likewise and make protected to avoid + exposing it in public std::tuple interface. + +2009-02-05 Chris Fairles <cfairles@gcc.gnu.org> Benjamin Kosnik <bkoz@redhat.com> * include/std/thread (__thread_data_base): Nest class in std::thread. diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 33e8731..d8e74f2 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -76,13 +76,13 @@ namespace std : _Head(__h) { } template<typename _UHead> - _Head_base(_UHead&& __h) - : _Head(std::forward<_UHead>(__h)) { } + _Head_base(_UHead&& __h) + : _Head(std::forward<_UHead>(__h)) { } _Head& _M_head() { return *this; } const _Head& _M_head() const { return *this; } - - void __swap_impl(_Head&&) { /* no-op */ } + + void _M_swap_impl(_Head&&) { /* no-op */ } }; template<std::size_t _Idx, typename _Head> @@ -95,14 +95,14 @@ namespace std : _M_head_impl(__h) { } template<typename _UHead> - _Head_base(_UHead&& __h) - : _M_head_impl(std::forward<_UHead>(__h)) { } + _Head_base(_UHead&& __h) + : _M_head_impl(std::forward<_UHead>(__h)) { } _Head& _M_head() { return _M_head_impl; } const _Head& _M_head() const { return _M_head_impl; } void - __swap_impl(_Head&& __h) + _M_swap_impl(_Head&& __h) { using std::swap; swap(__h, _M_head_impl); @@ -129,7 +129,8 @@ namespace std template<std::size_t _Idx> struct _Tuple_impl<_Idx> { - void __swap_impl(_Tuple_impl&&) { /* no-op */ } + protected: + void _M_swap_impl(_Tuple_impl&&) { /* no-op */ } }; /** @@ -216,11 +217,12 @@ namespace std return *this; } + protected: void - __swap_impl(_Tuple_impl&& __in) + _M_swap_impl(_Tuple_impl&& __in) { - _Base::__swap_impl(__in._M_head()); - _Inherited::__swap_impl(__in._M_tail()); + _Base::_M_swap_impl(__in._M_head()); + _Inherited::_M_swap_impl(__in._M_tail()); } }; @@ -296,7 +298,7 @@ namespace std void swap(tuple&& __in) - { _Inherited::__swap_impl(__in); } + { _Inherited::_M_swap_impl(__in); } }; |