diff options
author | Martin Braun <martin.braun@ettus.com> | 2019-10-17 16:01:22 -0700 |
---|---|---|
committer | Martin Braun <martin.braun@ettus.com> | 2019-11-26 12:21:32 -0800 |
commit | 72b45bb8def087f2eff09ed671de788978853e2a (patch) | |
tree | 87fc86059b61e5dc43ba19332056075bef845f6d /host/lib/usrp/b100 | |
parent | d3a16b702230534f7265613a73204bdb051a458e (diff) | |
download | uhd-72b45bb8def087f2eff09ed671de788978853e2a.tar.gz uhd-72b45bb8def087f2eff09ed671de788978853e2a.tar.bz2 uhd-72b45bb8def087f2eff09ed671de788978853e2a.zip |
uhd: Remove all usages of boost::tuple and friends
This replaces all of the following with standard C++ features:
- boost::tuple
- boost::make_tuple
- boost::tuple::get
- #include <boost/tuple/tuple.hpp>
All usages were replaced with search-and-replace scripts (the usages of
get could be automatically replaced with a vim macro, the rest was
straightforward search-and-replace).
Diffstat (limited to 'host/lib/usrp/b100')
-rw-r--r-- | host/lib/usrp/b100/codec_ctrl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/usrp/b100/codec_ctrl.cpp b/host/lib/usrp/b100/codec_ctrl.cpp index 1dac58916..10cfa686a 100644 --- a/host/lib/usrp/b100/codec_ctrl.cpp +++ b/host/lib/usrp/b100/codec_ctrl.cpp @@ -13,10 +13,10 @@ #include <uhd/utils/log.hpp> #include <uhd/utils/safe_call.hpp> #include <stdint.h> -#include <boost/tuple/tuple.hpp> #include <boost/math/special_functions/round.hpp> #include "b100_regs.hpp" //spi slave constants #include <boost/assign/list_of.hpp> +#include <tuple> using namespace uhd; @@ -229,7 +229,7 @@ void b100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){ uint8_t dac_word = uhd::clip(boost::math::iround(volts*0xff/3.3), 0, 0xff); //setup a lookup table for the aux dac params (reg ref, reg addr) - typedef boost::tuple<uint8_t*, uint8_t> dac_params_t; + typedef std::tuple<uint8_t*, uint8_t> dac_params_t; uhd::dict<aux_dac_t, dac_params_t> aux_dac_to_params = boost::assign::map_list_of (AUX_DAC_A, dac_params_t(&_ad9862_regs.aux_dac_a, 36)) (AUX_DAC_B, dac_params_t(&_ad9862_regs.aux_dac_b, 37)) @@ -239,7 +239,7 @@ void b100_codec_ctrl_impl::write_aux_dac(aux_dac_t which, double volts){ //set the aux dac register UHD_ASSERT_THROW(aux_dac_to_params.has_key(which)); uint8_t *reg_ref, reg_addr; - boost::tie(reg_ref, reg_addr) = aux_dac_to_params[which]; + std::tie(reg_ref, reg_addr) = aux_dac_to_params[which]; *reg_ref = dac_word; this->send_reg(reg_addr); } |