mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-15 20:50:33 +00:00
Code Issues Releases Wiki Activity

Fix issues with boost::condition

Browse Source
This commit is contained in:
Carles Fernandez 2020-04-26 10:20:03 +02:00
parent 873b1feb68
commit a19c3ffc2f
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/algorithms/signal_source/gnuradio_blocks/rtl_tcp_signal_source_c.cc
View File

@ -21,13 +21,10 @@
#include "rtl_tcp_signal_source_c.h" #include "rtl_tcp_signal_source_c.h"
#include "rtl_tcp_commands.h" #include "rtl_tcp_commands.h"
#include <boost/bind.hpp>
#include <boost/thread/thread.hpp> #include <boost/thread/thread.hpp>
#include <glog/logging.h> #include <glog/logging.h>
#include <map> #include <map>
#if HAS_GENERIC_LAMBDA
#else
#include <boost/bind.hpp>
#endif
namespace ip = boost::asio::ip; namespace ip = boost::asio::ip;
@ -301,11 +298,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec,
// Unpack read data // Unpack read data
boost::mutex::scoped_lock lock(mutex_); boost::mutex::scoped_lock lock(mutex_);
not_full_.wait(lock, not_full_.wait(lock,
#if HAS_GENERIC_LAMBDA boost::bind(&rtl_tcp_signal_source_c::not_full, this)); // NOLINT(modernize-avoid-bind)
[this] { not_full(); });
#else
boost::bind(&rtl_tcp_signal_source_c::not_full, this));
#endif
for (size_t i = 0; i < bytes_transferred; i++) for (size_t i = 0; i < bytes_transferred; i++)
{ {
@ -315,11 +308,7 @@ void rtl_tcp_signal_source_c::handle_read(const boost::system::error_code &ec,
// wait until there's space for more // wait until there's space for more
not_empty_.notify_one(); // needed? not_empty_.notify_one(); // needed?
not_full_.wait(lock, not_full_.wait(lock,
#if HAS_GENERIC_LAMBDA boost::bind(&rtl_tcp_signal_source_c::not_full, this)); // NOLINT(modernize-avoid-bind)
[this] { not_full(); });
#else
boost::bind(&rtl_tcp_signal_source_c::not_full, this));
#endif
} }
buffer_.push_front(lookup_[data_[i]]); buffer_.push_front(lookup_[data_[i]]);
@ -354,11 +343,8 @@ int rtl_tcp_signal_source_c::work(int noutput_items,
{ {
boost::mutex::scoped_lock lock(mutex_); boost::mutex::scoped_lock lock(mutex_);
not_empty_.wait(lock, not_empty_.wait(lock,
#if HAS_GENERIC_LAMBDA boost::bind(&rtl_tcp_signal_source_c::not_empty, this)); // NOLINT(modernize-avoid-bind)
[this] { not_empty(); });
#else
boost::bind(&rtl_tcp_signal_source_c::not_empty, this));
#endif
for (; i < noutput_items && unread_ > 1; i++) for (; i < noutput_items && unread_ > 1; i++)
{ {
float re = buffer_[--unread_]; float re = buffer_[--unread_];