Merge branch 'patch-6' of https://github.com/alex85k/Project-OSRM into alex85k-patch-6

This commit is contained in:
Dennis Luxen 2014-06-05 11:04:17 +02:00
commit 2c01425ee5

View File

@ -46,7 +46,6 @@ template <typename Data> class ConcurrentQueue
[this] [this]
{ return m_internal_queue.size() < m_internal_queue.capacity(); }); { return m_internal_queue.size() < m_internal_queue.capacity(); });
m_internal_queue.push_back(data); m_internal_queue.push_back(data);
m_mutex.unlock();
m_not_empty.notify_one(); m_not_empty.notify_one();
} }
@ -60,7 +59,6 @@ template <typename Data> class ConcurrentQueue
{ return !m_internal_queue.empty(); }); { return !m_internal_queue.empty(); });
popped_value = m_internal_queue.front(); popped_value = m_internal_queue.front();
m_internal_queue.pop_front(); m_internal_queue.pop_front();
m_mutex.unlock();
m_not_full.notify_one(); m_not_full.notify_one();
} }
@ -73,7 +71,6 @@ template <typename Data> class ConcurrentQueue
} }
popped_value = m_internal_queue.front(); popped_value = m_internal_queue.front();
m_internal_queue.pop_front(); m_internal_queue.pop_front();
m_mutex.unlock();
m_not_full.notify_one(); m_not_full.notify_one();
return true; return true;
} }