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/lib/usrp/usrp2/usrp2_iface.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

(limited to 'host/lib/usrp/usrp2/usrp2_iface.cpp')

diff --git a/host/lib/usrp/usrp2/usrp2_iface.cpp b/host/lib/usrp/usrp2/usrp2_iface.cpp
index c8283c500..962ead769 100644
--- a/host/lib/usrp/usrp2/usrp2_iface.cpp
+++ b/host/lib/usrp/usrp2/usrp2_iface.cpp
@@ -5,29 +5,28 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include "usrp2_regs.hpp"
-#include "usrp2_impl.hpp"
-#include "fw_common.h"
 #include "usrp2_iface.hpp"
+#include "fw_common.h"
+#include "usrp2_impl.hpp"
+#include "usrp2_regs.hpp"
 #include <uhd/exception.hpp>
+#include <uhd/types/dict.hpp>
 #include <uhd/utils/log.hpp>
 #include <uhd/utils/paths.hpp>
-#include <uhd/utils/tasks.hpp>
-#include <uhd/utils/paths.hpp>
+#include <uhd/utils/platform.hpp>
 #include <uhd/utils/safe_call.hpp>
-#include <uhd/types/dict.hpp>
+#include <uhd/utils/tasks.hpp>
 #include <boost/asio.hpp> //used for htonl and ntohl
 #include <boost/assign/list_of.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/format.hpp>
-#include <boost/bind.hpp>
-#include <boost/tokenizer.hpp>
 #include <boost/functional/hash.hpp>
-#include <boost/filesystem.hpp>
+#include <boost/tokenizer.hpp>
 #include <algorithm>
-#include <iostream>
 #include <chrono>
+#include <functional>
+#include <iostream>
 #include <thread>
-#include <uhd/utils/platform.hpp>
 
 using namespace uhd;
 using namespace uhd::usrp;
@@ -88,7 +87,7 @@ public:
     void lock_device(bool lock){
         if (lock){
             this->pokefw(U2_FW_REG_LOCK_GPID, get_process_hash());
-            _lock_task = task::make(boost::bind(&usrp2_iface_impl::lock_task, this));
+            _lock_task = task::make(std::bind(&usrp2_iface_impl::lock_task, this));
         }
         else{
             _lock_task.reset(); //shutdown the task
-- 
cgit v1.2.3