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/utils/gain_group.cpp |  4 ++--
 host/lib/utils/ihex.cpp       |  7 ++++---
 host/lib/utils/paths.cpp      |  2 +-
 host/lib/utils/tasks.cpp      | 15 ++++++++-------
 4 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'host/lib/utils')

diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index cda10a881..32f14d062 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -10,8 +10,8 @@
 #include <uhd/utils/algorithm.hpp>
 #include <uhd/utils/gain_group.hpp>
 #include <uhd/utils/log.hpp>
-#include <boost/bind.hpp>
 #include <algorithm>
+#include <functional>
 #include <vector>
 
 using namespace uhd;
@@ -130,7 +130,7 @@ public:
         }
         std::sort(indexes_step_size_dec.begin(),
             indexes_step_size_dec.end(),
-            boost::bind(&compare_by_step_size, _1, _2, all_fcns));
+            std::bind(&compare_by_step_size, std::placeholders::_1, std::placeholders::_2, all_fcns));
         UHD_ASSERT_THROW(all_fcns.at(indexes_step_size_dec.front()).get_range().step()
                          >= all_fcns.at(indexes_step_size_dec.back()).get_range().step());
 
diff --git a/host/lib/utils/ihex.cpp b/host/lib/utils/ihex.cpp
index fed2b239e..24d8cbdb6 100644
--- a/host/lib/utils/ihex.cpp
+++ b/host/lib/utils/ihex.cpp
@@ -8,9 +8,10 @@
 #include <uhd/exception.hpp>
 #include <uhdlib/utils/ihex.hpp>
 #include <boost/format.hpp>
+#include <fstream>
+#include <functional>
 #include <memory>
 #include <sstream>
-#include <fstream>
 
 using namespace uhd;
 
@@ -196,7 +197,7 @@ void ihex_reader::to_bin_file(const std::string &bin_filename)
         throw uhd::io_error(str(boost::format("Could not open file for writing: %s") % bin_filename));
     }
 
-    this->read(boost::bind(&_file_writer_callback, output_file, _3, _4));
+    this->read(std::bind(&_file_writer_callback, output_file, std::placeholders::_3, std::placeholders::_4));
 
     output_file->close();
 }
@@ -219,7 +220,7 @@ std::vector<uint8_t> ihex_reader::to_vector(const size_t size_estimate)
     std::vector<uint8_t> buf;
     buf.reserve(size_estimate == 0 ? DEFAULT_SIZE_ESTIMATE : size_estimate);
 
-    this->read(boost::bind(&_vector_writer_callback, boost::ref(buf), _3, _4));
+    this->read(std::bind(&_vector_writer_callback, std::ref(buf), std::placeholders::_3, std::placeholders::_4));
 
     return buf;
 }
diff --git a/host/lib/utils/paths.cpp b/host/lib/utils/paths.cpp
index 7fd64e6f5..c99de2c89 100644
--- a/host/lib/utils/paths.cpp
+++ b/host/lib/utils/paths.cpp
@@ -11,7 +11,7 @@
 #include <uhdlib/utils/paths.hpp>
 
 #include <boost/algorithm/string.hpp>
-#include <boost/bind.hpp>
+#include <functional>
 #include <boost/filesystem.hpp>
 #include <boost/format.hpp>
 #include <regex>
diff --git a/host/lib/utils/tasks.cpp b/host/lib/utils/tasks.cpp
index 888a5a8f1..658c361a9 100644
--- a/host/lib/utils/tasks.cpp
+++ b/host/lib/utils/tasks.cpp
@@ -5,18 +5,19 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 //
 
-#include <uhd/utils/tasks.hpp>
+#include <uhd/exception.hpp>
+#include <uhd/utils/log.hpp>
 #include <uhd/utils/msg_task.hpp>
+#include <uhd/utils/tasks.hpp>
 #include <uhd/utils/thread.hpp>
-#include <uhd/utils/log.hpp>
-#include <uhd/exception.hpp>
-#include <boost/thread/thread.hpp>
 #include <boost/thread/barrier.hpp>
+#include <boost/thread/thread.hpp>
+#include <atomic>
 #include <exception>
+#include <functional>
 #include <iostream>
-#include <vector>
 #include <thread>
-#include <atomic>
+#include <vector>
 
 using namespace uhd;
 
@@ -88,7 +89,7 @@ public:
     msg_task_impl(const task_fcn_type &task_fcn):
         _spawn_barrier(2)
     {
-        (void)_thread_group.create_thread(boost::bind(&msg_task_impl::task_loop, this, task_fcn));
+        (void)_thread_group.create_thread(std::bind(&msg_task_impl::task_loop, this, task_fcn));
         _spawn_barrier.wait();
     }
 
-- 
cgit v1.2.3