Subject: [Boost-commit] svn:boost r85841 - trunk/boost/thread
From: vicente.botet_at_[hidden]
Date: 2013-09-22 18:23:58
Author: viboes
Date: 2013-09-22 18:23:58 EDT (Sun, 22 Sep 2013)
New Revision: 85841
URL: http://svn.boost.org/trac/boost/changeset/85841
Log:
Thread: fix some move issues on sync_queue.
Text files modified:
trunk/boost/thread/sync_queue.hpp | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
Modified: trunk/boost/thread/sync_queue.hpp
==============================================================================
--- trunk/boost/thread/sync_queue.hpp Sun Sep 22 18:22:08 2013 (r85840)
+++ trunk/boost/thread/sync_queue.hpp 2013-09-22 18:23:58 EDT (Sun, 22 Sep 2013) (r85841)
@@ -52,10 +52,11 @@
inline void close();
inline void push(const value_type& x);
- inline void push(BOOST_THREAD_RV_REF(value_type) x);
inline bool try_push(const value_type& x);
- inline bool try_push(BOOST_THREAD_RV_REF(value_type) x);
inline bool try_push(no_block_tag, const value_type& x);
+
+ inline void push(BOOST_THREAD_RV_REF(value_type) x);
+ inline bool try_push(BOOST_THREAD_RV_REF(value_type) x);
inline bool try_push(no_block_tag, BOOST_THREAD_RV_REF(value_type) x);
// Observers/Modifiers
@@ -129,7 +130,7 @@
inline void push(BOOST_THREAD_RV_REF(value_type) elem, unique_lock<mutex>& lk)
{
- data_.push(boost::move(elem));
+ data_.push_back(boost::move(elem));
notify_not_empty_if_needed(lk);
}
};
@@ -441,7 +442,7 @@
try
{
unique_lock<mutex> lk(mtx_);
- return try_push(elem, lk);
+ return try_push(boost::forward<ValueType>(elem), lk);
}
catch (...)
{
@@ -460,7 +461,7 @@
{
return false;
}
- return try_push(elem, lk);
+ return try_push(boost::forward<ValueType>(elem), lk);
}
catch (...)
{
@@ -476,7 +477,7 @@
{
unique_lock<mutex> lk(mtx_);
throw_if_closed(lk);
- push(elem, lk);
+ push(boost::move(elem), lk);
}
catch (...)
{