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/cores | |
| 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/cores')
| -rw-r--r-- | host/lib/usrp/cores/rx_dsp_core_200.cpp | 5 | ||||
| -rw-r--r-- | host/lib/usrp/cores/rx_vita_core_3000.cpp | 6 |
2 files changed, 6 insertions, 5 deletions
diff --git a/host/lib/usrp/cores/rx_dsp_core_200.cpp b/host/lib/usrp/cores/rx_dsp_core_200.cpp index a87b92a50..700a3c207 100644 --- a/host/lib/usrp/cores/rx_dsp_core_200.cpp +++ b/host/lib/usrp/cores/rx_dsp_core_200.cpp @@ -19,6 +19,7 @@ #include <cmath> #include <chrono> #include <thread> +#include <tuple> #define REG_DSP_RX_FREQ _dsp_base + 0 #define REG_DSP_RX_SCALE_IQ _dsp_base + 4 @@ -105,7 +106,7 @@ public: _continuous_streaming = stream_cmd.stream_mode == stream_cmd_t::STREAM_MODE_START_CONTINUOUS; //setup the mode to instruction flags - typedef boost::tuple<bool, bool, bool, bool> inst_t; + typedef std::tuple<bool, bool, bool, bool> inst_t; static const uhd::dict<stream_cmd_t::stream_mode_t, inst_t> mode_to_inst = boost::assign::map_list_of //reload, chain, samps, stop (stream_cmd_t::STREAM_MODE_START_CONTINUOUS, inst_t(true, true, false, false)) @@ -116,7 +117,7 @@ public: //setup the instruction flag values bool inst_reload, inst_chain, inst_samps, inst_stop; - boost::tie(inst_reload, inst_chain, inst_samps, inst_stop) = mode_to_inst[stream_cmd.stream_mode]; + std::tie(inst_reload, inst_chain, inst_samps, inst_stop) = mode_to_inst[stream_cmd.stream_mode]; //calculate the word from flags and length uint32_t cmd_word = 0; diff --git a/host/lib/usrp/cores/rx_vita_core_3000.cpp b/host/lib/usrp/cores/rx_vita_core_3000.cpp index 764fc1334..166e0d83f 100644 --- a/host/lib/usrp/cores/rx_vita_core_3000.cpp +++ b/host/lib/usrp/cores/rx_vita_core_3000.cpp @@ -9,10 +9,10 @@ #include <uhd/utils/safe_call.hpp> #include <uhdlib/usrp/cores/rx_vita_core_3000.hpp> #include <boost/assign/list_of.hpp> -#include <boost/tuple/tuple.hpp> #include <boost/date_time.hpp> #include <thread> #include <chrono> +#include <tuple> #define REG_FRAMER_MAXLEN _base + 4*4 + 0 #define REG_FRAMER_SID _base + 4*4 + 4 @@ -94,7 +94,7 @@ struct rx_vita_core_3000_impl : rx_vita_core_3000 _continuous_streaming = stream_cmd.stream_mode == stream_cmd_t::STREAM_MODE_START_CONTINUOUS; //setup the mode to instruction flags - typedef boost::tuple<bool, bool, bool, bool> inst_t; + typedef std::tuple<bool, bool, bool, bool> inst_t; static const uhd::dict<stream_cmd_t::stream_mode_t, inst_t> mode_to_inst = boost::assign::map_list_of //reload, chain, samps, stop (stream_cmd_t::STREAM_MODE_START_CONTINUOUS, inst_t(true, true, false, false)) @@ -105,7 +105,7 @@ struct rx_vita_core_3000_impl : rx_vita_core_3000 //setup the instruction flag values bool inst_reload, inst_chain, inst_samps, inst_stop; - boost::tie(inst_reload, inst_chain, inst_samps, inst_stop) = mode_to_inst[stream_cmd.stream_mode]; + std::tie(inst_reload, inst_chain, inst_samps, inst_stop) = mode_to_inst[stream_cmd.stream_mode]; //calculate the word from flags and length uint32_t cmd_word = 0; |