mirror of
https://github.com/boostorg/move.git
synced 2025-08-01 05:14:27 +02:00
Move/Thread: Added type tait so that #6141 - Compilation error when boost.thread and boost.move are used together - can be solved on the Boost.Thread side
[SVN r76271]
This commit is contained in:
@@ -283,6 +283,10 @@
|
|||||||
: BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
|
: BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
|
||||||
{};
|
{};
|
||||||
|
|
||||||
|
template <class T>
|
||||||
|
struct has_move_emulation_enabled_aux
|
||||||
|
: has_move_emulation_enabled<T> {};
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
struct has_nothrow_move
|
struct has_nothrow_move
|
||||||
: public BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
|
: public BOOST_MOVE_BOOST_NS::integral_constant<bool, false>
|
||||||
@@ -293,8 +297,9 @@
|
|||||||
// move()
|
// move()
|
||||||
//
|
//
|
||||||
//////////////////////////////////////////////////////////////////////////////
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
template <class T>
|
template <class T>
|
||||||
typename BOOST_MOVE_BOOST_NS::disable_if<has_move_emulation_enabled<T>, T&>::type move(T& x)
|
typename BOOST_MOVE_BOOST_NS::disable_if<has_move_emulation_enabled_aux<T>, T&>::type move(T& x)
|
||||||
{
|
{
|
||||||
return x;
|
return x;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user