+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>
: _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>
: _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);
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 */ }
};
/**
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());
}
};
void
swap(tuple&& __in)
- { _Inherited::__swap_impl(__in); }
+ { _Inherited::_M_swap_impl(__in); }
};