From d3a16b702230534f7265613a73204bdb051a458e Mon Sep 17 00:00:00 2001
From: Martin Braun <martin.braun@ettus.com>
Date: Wed, 16 Oct 2019 16:21:19 -0700
Subject: uhd: Replace all occurrences of boost::bind with std::bind

Note: Replacing everything with a lambda would be even better, but that
can't be easily scripted so we'll do this as a first step to reduce the
Boost footprint.

This also removes occurences of #include <boost/bind.hpp>, and makes
sure all usages of std::bind have an #include <functional>. clang-format
wasn't always applied to minimize the changeset in this commit, however,
it was applied to the blocks of #includes.

Due to conflicts with other Boost libraries, the placeholders _1, _2,
etc. could not be directly used, but had to be explicitly called out
(as std::placeholders::_1, etc.). This makes the use of std::bind even
uglier, which serves as another reminder that using std::bind (and even
more so, boost::bind) should be avoided.

nirio/rpc/rpc_client.cpp still contains a reference to boost::bind. It
was not possible to remove it by simply doing a search and replace, so
it will be removed in a separate commit.
---
 host/include/uhd/transport/bounded_buffer.ipp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'host/include')

diff --git a/host/include/uhd/transport/bounded_buffer.ipp b/host/include/uhd/transport/bounded_buffer.ipp
index d1058756d..16ce5f312 100644
--- a/host/include/uhd/transport/bounded_buffer.ipp
+++ b/host/include/uhd/transport/bounded_buffer.ipp
@@ -10,12 +10,11 @@
 
 #include <uhd/config.hpp>
 #include <uhd/utils/noncopyable.hpp>
-#include <boost/bind.hpp>
-#include <boost/utility.hpp>
-#include <functional>
 #include <boost/circular_buffer.hpp>
 #include <boost/thread/condition.hpp>
 #include <boost/thread/locks.hpp>
+#include <boost/utility.hpp>
+#include <functional>
 
 namespace uhd{ namespace transport{
 
@@ -26,8 +25,8 @@ namespace uhd{ namespace transport{
         bounded_buffer_detail(size_t capacity):
             _buffer(capacity)
         {
-            _not_full_fcn  = boost::bind(&bounded_buffer_detail<elem_type>::not_full, this);
-            _not_empty_fcn = boost::bind(&bounded_buffer_detail<elem_type>::not_empty, this);
+            _not_full_fcn  = std::bind(&bounded_buffer_detail<elem_type>::not_full, this);
+            _not_empty_fcn = std::bind(&bounded_buffer_detail<elem_type>::not_empty, this);
         }
 
         UHD_INLINE bool push_with_haste(const elem_type &elem)
-- 
cgit v1.2.3