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

move.h (forward): Reinstate the N2835 version. 

2010-08-11  Paolo Carlini  <paolo.carlini@oracle.com>

	* include/bits/move.h (forward): Reinstate the N2835 version.

From-SVN: r163101
This commit is contained in:
Paolo Carlini 2010-08-11 16:55:33 +00:00 committed by Paolo Carlini
parent be94d007e6
commit 4c7aaebf4d
2 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,7 @@
2010-08-11 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/move.h (forward): Reinstate the N2835 version.
2010-08-11 Paolo Carlini <paolo.carlini@oracle.com>
PR libstdc++/42925

33
libstdc++-v3/include/bits/move.h
View File

@ -51,16 +51,29 @@ _GLIBCXX_END_NAMESPACE
_GLIBCXX_BEGIN_NAMESPACE(std)
/// forward
template<typename _Tp, typename _Up>
inline typename
enable_if<((std::is_convertible<
typename std::remove_reference<_Up>::type*,
typename std::remove_reference<_Tp>::type*>::value)
&& (!std::is_lvalue_reference<_Tp>::value
|| std::is_lvalue_reference<_Up>::value)), _Tp&&>::type
forward(_Up&& __u)
{ return static_cast<_Tp&&>(__u); }
/// forward (as per N2835)
/// Forward lvalues as rvalues.
template<typename _Tp>
inline typename enable_if<!is_lvalue_reference<_Tp>::value, _Tp&&>::type
forward(typename std::common_type<_Tp>::type& __t)
{ return static_cast<_Tp&&>(__t); }
/// Forward rvalues as rvalues.
template<typename _Tp>
inline typename enable_if<!is_lvalue_reference<_Tp>::value, _Tp&&>::type
forward(typename std::common_type<_Tp>::type&& __t)
{ return static_cast<_Tp&&>(__t); }
// Forward lvalues as lvalues.
template<typename _Tp>
inline typename enable_if<is_lvalue_reference<_Tp>::value, _Tp>::type
forward(typename std::common_type<_Tp>::type __t)
{ return __t; }
// Prevent forwarding rvalues as const lvalues.
template<typename _Tp>
inline typename enable_if<is_lvalue_reference<_Tp>::value, _Tp>::type
forward(typename std::remove_reference<_Tp>::type&& __t) = delete;
/**
* @brief Move a value.