diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-10-16 16:21:19 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:32 -0800 |
commit | d3a16b702230534f7265613a73204bdb051a458e (patch) | |
tree | 5cd9ace71b187aa2c5d8deb5904b14db28dc7c70 /host/lib/utils/ihex.cpp | |
parent | dc698b990d368dfb8641b68dbe32a90079b7bd90 (diff) | |
download | uhd-d3a16b702230534f7265613a73204bdb051a458e.tar.gz uhd-d3a16b702230534f7265613a73204bdb051a458e.tar.bz2 uhd-d3a16b702230534f7265613a73204bdb051a458e.zip |
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.
Diffstat (limited to 'host/lib/utils/ihex.cpp')
-rw-r--r-- | host/lib/utils/ihex.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
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; } |