OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tuple (_Head_base<>::_Head_base(_UHead&&)): Formatting.

Browse Source 
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
This commit is contained in:
Chris Fairles 2009-02-06 06:01:40 +00:00
parent 6d39673dce
commit fe960d9257
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,10 @@
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>

26
libstdc++-v3/include/std/tuple
View File

@ -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); }
};