diff options
author | Martin Braun <martin.braun@ettus.com> | 2021-06-19 00:06:52 +0200 |
---|---|---|
committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-06-24 12:00:49 -0500 |
commit | 188fbb17cfd18c87f60ec56f62476f97ef2779bb (patch) | |
tree | e88b9fb8436aa42f3ecbdc0403751a3e68bbbac8 /host/lib/usrp/usrp2/clock_ctrl.cpp | |
parent | 78ec29b6becd53f79a0ae282ae22c38bedb887d1 (diff) | |
download | uhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.tar.gz uhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.tar.bz2 uhd-188fbb17cfd18c87f60ec56f62476f97ef2779bb.zip |
uhd: Remove all occurences of boost::math::*round()
Its behaviour is almost identical to std::lround, which we use instead.
The only downside of std::lround is that it always returns a long, which
we don't always need. We thus add some casts for those cases to make the
compiler happy.
Diffstat (limited to 'host/lib/usrp/usrp2/clock_ctrl.cpp')
-rw-r--r-- | host/lib/usrp/usrp2/clock_ctrl.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/host/lib/usrp/usrp2/clock_ctrl.cpp b/host/lib/usrp/usrp2/clock_ctrl.cpp index 324826dc0..8c5801bda 100644 --- a/host/lib/usrp/usrp2/clock_ctrl.cpp +++ b/host/lib/usrp/usrp2/clock_ctrl.cpp @@ -13,9 +13,8 @@ #include <uhd/utils/assert_has.hpp> #include <uhd/utils/safe_call.hpp> #include <uhdlib/utils/narrow.hpp> -#include <stdint.h> -#include <boost/math/special_functions/round.hpp> -#include <iostream> +#include <cmath> +#include <cstdint> using namespace uhd; @@ -317,7 +316,7 @@ public: // offset_ns = 0.34 + (1600 - i_ramp_ua)*1e-4 + ((caps-1)/ramp)*6 // delay_ns = offset_ns + range_ns * delay / 31 - int delay_val = boost::math::iround(delay / 9.744e-9 * 31); + int delay_val = static_cast<int>(std::lround(delay / 9.744e-9 * 31)); if (delay_val == 0) { switch (clk_regs.exp) { |