From f47df4d1a83289043ef40469141aaa03d0c60d35 Mon Sep 17 00:00:00 2001 From: Lane Kolbly Date: Fri, 9 Jul 2021 17:02:06 -0500 Subject: host: Add static_assert to prevent meta_range_t(0,0) meta_range_t(0,0) actually calls the iterator-based constructor for meta_range_t, which is almost certainly not the intended constructor for that call syntax. Therefore, we add a static_assert to prevent such usage, and fix all failing instances. --- host/lib/rfnoc/radio_control_impl.cpp | 4 ++-- host/lib/usrp/multi_usrp.cpp | 4 ++-- host/lib/usrp/multi_usrp_rfnoc.cpp | 4 ++-- host/lib/usrp/x300/x300_radio_control.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'host/lib') diff --git a/host/lib/rfnoc/radio_control_impl.cpp b/host/lib/rfnoc/radio_control_impl.cpp index 0a3eda277..70b17efb3 100644 --- a/host/lib/rfnoc/radio_control_impl.cpp +++ b/host/lib/rfnoc/radio_control_impl.cpp @@ -767,7 +767,7 @@ void radio_control_impl::set_tx_dc_offset(const std::complex&, size_t) uhd::meta_range_t radio_control_impl::get_tx_dc_offset_range(size_t) const { - return uhd::meta_range_t(0, 0); + return uhd::meta_range_t(0.0, 0.0); } void radio_control_impl::set_tx_iq_balance(const std::complex&, size_t) @@ -792,7 +792,7 @@ void radio_control_impl::set_rx_dc_offset(const std::complex&, size_t) uhd::meta_range_t radio_control_impl::get_rx_dc_offset_range(size_t) const { - return uhd::meta_range_t(0, 0); + return uhd::meta_range_t(0.0, 0.0); } void radio_control_impl::set_rx_iq_balance(const bool enb, size_t) diff --git a/host/lib/usrp/multi_usrp.cpp b/host/lib/usrp/multi_usrp.cpp index 721b57ec9..89c4cbc26 100644 --- a/host/lib/usrp/multi_usrp.cpp +++ b/host/lib/usrp/multi_usrp.cpp @@ -1847,7 +1847,7 @@ public: } else { UHD_LOGGER_WARNING("MULTI_USRP") << "This device does not support querying the RX DC offset range."; - return meta_range_t(0, 0); + return meta_range_t(0.0, 0.0); } } @@ -2340,7 +2340,7 @@ public: } else { UHD_LOGGER_WARNING("MULTI_USRP") << "This device does not support querying the TX DC offset range."; - return meta_range_t(0, 0); + return meta_range_t(0.0, 0.0); } } diff --git a/host/lib/usrp/multi_usrp_rfnoc.cpp b/host/lib/usrp/multi_usrp_rfnoc.cpp index bee19215c..d1d90ed4d 100644 --- a/host/lib/usrp/multi_usrp_rfnoc.cpp +++ b/host/lib/usrp/multi_usrp_rfnoc.cpp @@ -1209,7 +1209,7 @@ public: rx_chain.radio->get_rx_frequency_range(rx_chain.block_chan); freq_range_t dsp_range = (rx_chain.ddc) ? rx_chain.ddc->get_frequency_range(rx_chain.block_chan) - : meta_range_t(0, 0); + : meta_range_t(0.0, 0.0); // Create lambdas to feed to tune_xx_subdev_and_dsp() // Note: If there is no DDC present, register empty lambdas for the DSP functions auto set_rf_freq = [rx_chain](double freq) { @@ -1840,7 +1840,7 @@ public: tx_chain.radio->get_tx_frequency_range(tx_chain.block_chan); freq_range_t dsp_range = (tx_chain.duc) ? tx_chain.duc->get_frequency_range(tx_chain.block_chan) - : meta_range_t(0, 0); + : meta_range_t(0.0, 0.0); // Create lambdas to feed to tune_xx_subdev_and_dsp() // Note: If there is no DDC present, register empty lambdas for the DSP functions auto set_rf_freq = [tx_chain](double freq) { diff --git a/host/lib/usrp/x300/x300_radio_control.cpp b/host/lib/usrp/x300/x300_radio_control.cpp index 73006a7c8..54f03fc6c 100644 --- a/host/lib/usrp/x300/x300_radio_control.cpp +++ b/host/lib/usrp/x300/x300_radio_control.cpp @@ -821,7 +821,7 @@ public: } else { RFNOC_LOG_WARNING( "This device does not support querying the TX DC offset range."); - return meta_range_t(0, 0); + return meta_range_t(0.0, 0.0); } } @@ -864,7 +864,7 @@ public: } else { RFNOC_LOG_WARNING( "This device does not support querying the rx DC offset range."); - return meta_range_t(0, 0); + return meta_range_t(0.0, 0.0); } } -- cgit v1.2.3