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/b200/b200_iface.cpp | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

(limited to 'host/lib/usrp/b200/b200_iface.cpp')

diff --git a/host/lib/usrp/b200/b200_iface.cpp b/host/lib/usrp/b200/b200_iface.cpp
index 082be071c..c2bd9bace 100644
--- a/host/lib/usrp/b200/b200_iface.cpp
+++ b/host/lib/usrp/b200/b200_iface.cpp
@@ -6,25 +6,24 @@
 //
 
 #include "b200_iface.hpp"
-
 #include <uhd/config.hpp>
-#include <uhd/utils/log.hpp>
 #include <uhd/exception.hpp>
+#include <uhd/utils/log.hpp>
 #include <uhdlib/utils/ihex.hpp>
-
+#include <libusb.h>
+#include <stdint.h>
+#include <boost/filesystem.hpp>
+#include <boost/format.hpp>
 #include <boost/functional/hash.hpp>
 #include <boost/lexical_cast.hpp>
-#include <boost/format.hpp>
-#include <boost/filesystem.hpp>
-#include <libusb.h>
-#include <fstream>
-#include <string>
-#include <vector>
+#include <chrono>
 #include <cstring>
+#include <fstream>
+#include <functional>
 #include <iomanip>
-#include <chrono>
+#include <string>
 #include <thread>
-#include <stdint.h>
+#include <vector>
 
 //! libusb_error_name is only in newer API
 #ifndef HAVE_LIBUSB_ERROR_NAME
@@ -215,9 +214,9 @@ public:
         ihex_reader file_reader(filestring);
         try {
             file_reader.read(
-                boost::bind(
+                std::bind(
                     &b200_iface_impl::fx3_control_write, this,
-                    FX3_FIRMWARE_LOAD, _1, _2, _3, _4, 0
+                    FX3_FIRMWARE_LOAD, std::placeholders::_1, std::placeholders::_2, std::placeholders::_3, std::placeholders::_4, 0
                 )
             );
         } catch (const uhd::io_error &e) {
-- 
cgit v1.2.3