diff options
| author | Jason Merrill <jason@redhat.com> | 2009-07-31 22:26:32 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2009-07-31 22:26:32 -0400 |
| commit | 4c65085391c06df2a7b1acb4767e63aee6763d2c (patch) | |
| tree | 0622cddd7ff39f432afe2772f57eb2d805fea001 /libstdc++-v3/include/std/tuple | |
| parent | 9771799c29d553ad28453dd5bf2e72d6be593531 (diff) | |
| download | gcc-4c65085391c06df2a7b1acb4767e63aee6763d2c.zip gcc-4c65085391c06df2a7b1acb4767e63aee6763d2c.tar.gz gcc-4c65085391c06df2a7b1acb4767e63aee6763d2c.tar.bz2 | |
forward_list.h (splice_after): Use forward.
* include/bits/forward_list.h (splice_after): Use forward.
(merge): Likewise.
* include/bits/stl_iterator.h (move_iterator::operator*): Use move.
(move_iterator::operator[]): Use move.
* include/bits/stl_list.h (insert): Use move.
* include/std/thread (_Callable constructor): Use forward.
* include/std/tuple: Don't specify explicit template args to move.
From-SVN: r150326
Diffstat (limited to 'libstdc++-v3/include/std/tuple')
| -rw-r--r-- | libstdc++-v3/include/std/tuple | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/libstdc++-v3/include/std/tuple b/libstdc++-v3/include/std/tuple index 8dc8dcf..18cd89b 100644 --- a/libstdc++-v3/include/std/tuple +++ b/libstdc++-v3/include/std/tuple @@ -164,7 +164,7 @@ namespace std : _Inherited(__in._M_tail()), _Base(__in._M_head()) { } _Tuple_impl(_Tuple_impl&& __in) - : _Inherited(std::move<_Inherited&&>(__in._M_tail())), + : _Inherited(std::move(__in._M_tail())), _Base(std::forward<_Head>(__in._M_head())) { } template<typename... _UElements> @@ -173,8 +173,7 @@ namespace std template<typename... _UElements> _Tuple_impl(_Tuple_impl<_Idx, _UElements...>&& __in) - : _Inherited(std::move<typename _Tuple_impl<_Idx, _UElements...>:: - _Inherited&&>(__in._M_tail())), + : _Inherited(std::move(__in._M_tail())), _Base(std::forward<typename _Tuple_impl<_Idx, _UElements...>:: _Base>(__in._M_head())) { } @@ -244,7 +243,7 @@ namespace std : _Inherited(static_cast<const _Inherited&>(__in)) { } tuple(tuple&& __in) - : _Inherited(std::move<_Inherited>(__in)) { } + : _Inherited(static_cast<_Inherited&&>(__in)) { } template<typename... _UElements> tuple(const tuple<_UElements...>& __in) @@ -253,7 +252,7 @@ namespace std template<typename... _UElements> tuple(tuple<_UElements...>&& __in) - : _Inherited(std::move<_Tuple_impl<0, _UElements...> >(__in)) { } + : _Inherited(static_cast<_Tuple_impl<0, _UElements...>&&>(__in)) { } // XXX http://gcc.gnu.org/ml/libstdc++/2008-02/msg00047.html template<typename... _UElements> @@ -327,7 +326,7 @@ namespace std : _Inherited(static_cast<const _Inherited&>(__in)) { } tuple(tuple&& __in) - : _Inherited(std::move<_Inherited>(__in)) { } + : _Inherited(static_cast<_Inherited&&>(__in)) { } template<typename _U1, typename _U2> tuple(const tuple<_U1, _U2>& __in) @@ -335,7 +334,7 @@ namespace std template<typename _U1, typename _U2> tuple(tuple<_U1, _U2>&& __in) - : _Inherited(std::move<_Tuple_impl<0, _U1, _U2> >(__in)) { } + : _Inherited(static_cast<_Tuple_impl<0, _U1, _U2>&&>(__in)) { } template<typename _U1, typename _U2> tuple(const pair<_U1, _U2>& __in) |