From aec415ea7cb605533add340ae9166dc81605538e Mon Sep 17 00:00:00 2001 From: Edouard DUPIN Date: Mon, 7 Sep 2015 21:14:56 +0200 Subject: [PATCH] [DEBUG] correct fifo interface --- etk/os/Fifo.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/etk/os/Fifo.h b/etk/os/Fifo.h index f82a65f..a280ab0 100644 --- a/etk/os/Fifo.h +++ b/etk/os/Fifo.h @@ -48,13 +48,13 @@ namespace etk { bool wait(MY_TYPE &_data) { std::unique_lock lock(m_mutex); // Check if data is not previously here - while(0==m_data.size()) { + while(m_data.size() == 0) { m_condition.wait(lock); } // End Waiting message : - if (0 0) { // copy element : - _data = m_data[0]; + std::swap(_data, m_data[0]); // remove element : m_data.erase(m_data.begin()); return true; @@ -71,15 +71,15 @@ namespace etk { bool wait(MY_TYPE &_data, uint32_t _timeOutInUs) { std::unique_lock lock(m_mutex); // Check if data is not previously here - while(0==m_data.size()) { + while(m_data.size() == 0) { if (m_condition.wait_for(lock, std::chrono::microseconds(_timeOutInUs)) == std::cv_status::timeout) { return false; } } // End Waiting message : - if (0 0) { // copy element : - _data = m_data[0]; + std::swap(_data, m_data[0]); // remove element : m_data.erase(0); return true;