diff options
| author | StefanBruens <stefan.bruens@rwth-aachen.de> | 2021-05-05 18:49:40 +0200 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-06-22 07:42:58 -0500 |
| commit | d1c6290fe9c8b01068abfca6f272e2a1e031b9de (patch) | |
| tree | acd128dbd68998e62904f5873f2f505e670e4899 /host | |
| parent | 3796175f32f0cc24c16809d8175d423bc7053de9 (diff) | |
| download | uhd-d1c6290fe9c8b01068abfca6f272e2a1e031b9de.tar.gz uhd-d1c6290fe9c8b01068abfca6f272e2a1e031b9de.tar.bz2 uhd-d1c6290fe9c8b01068abfca6f272e2a1e031b9de.zip | |
usrp2: Use explicit template type for std::min<T>
Signed-off-by: Aaron Rossetto <aaron.rossetto@ni.com>
Diffstat (limited to 'host')
| -rw-r--r-- | host/lib/usrp/usrp2/usrp2_impl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp2/usrp2_impl.cpp b/host/lib/usrp/usrp2/usrp2_impl.cpp index 59fd9849c..e82a9fa71 100644 --- a/host/lib/usrp/usrp2/usrp2_impl.cpp +++ b/host/lib/usrp/usrp2/usrp2_impl.cpp @@ -917,7 +917,7 @@ double usrp2_impl::set_tx_dsp_freq(const std::string& mb, const double freq_) const double tick_rate = _tree->access<double>("/mboards/" + mb + "/tick_rate").get(); // calculate the DAC shift (multiples of rate) - const int zone = std::max(std::min(std::lround(new_freq / tick_rate), 2), -2); + const int zone = std::max(std::min<int>(std::lround(new_freq / tick_rate), 2), -2); const double dac_shift = zone * tick_rate; new_freq -= dac_shift; // update FPGA DSP target freq UHD_LOG_TRACE("USRP2", |