diff options
| author | Martin Braun <martin.braun@ettus.com> | 2019-01-15 15:04:03 -0800 |
|---|---|---|
| committer | Brent Stapleton <brent.stapleton@ettus.com> | 2019-01-18 09:37:12 -0800 |
| commit | 7fab6b807ef5b86c97577170b7b5fdc667e3fa20 (patch) | |
| tree | 0cdb0ab0711599d36f192c77a6129abbf235ad73 /host/lib/usrp/b200 | |
| parent | 11c7e561fc29b56ade8ae6ec549b21c533540e8a (diff) | |
| download | uhd-7fab6b807ef5b86c97577170b7b5fdc667e3fa20.tar.gz uhd-7fab6b807ef5b86c97577170b7b5fdc667e3fa20.tar.bz2 uhd-7fab6b807ef5b86c97577170b7b5fdc667e3fa20.zip | |
math: Replace boost::*::{lcm,gcd}() with portable versions
Boost changed the lcm() and gcd() functions in Boost 1.67. This creates
portable UHD versions to be used instead. They use various Boost
versions under the hood conditionally.
Diffstat (limited to 'host/lib/usrp/b200')
| -rw-r--r-- | host/lib/usrp/b200/b200_io_impl.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/host/lib/usrp/b200/b200_io_impl.cpp b/host/lib/usrp/b200/b200_io_impl.cpp index 4f4eba052..69797017b 100644 --- a/host/lib/usrp/b200/b200_io_impl.cpp +++ b/host/lib/usrp/b200/b200_io_impl.cpp @@ -14,7 +14,6 @@ #include <uhdlib/usrp/common/validate_subdev_spec.hpp> #include <boost/bind.hpp> #include <boost/make_shared.hpp> -#include <boost/math/common_factor.hpp> #include <set> using namespace uhd; @@ -111,7 +110,7 @@ void b200_impl::set_auto_tick_rate( } // Clean up floating point rounding errors if they crept in this_dsp_rate = std::min(max_tick_rate, this_dsp_rate); - lcm_rate = boost::math::lcm<uint32_t>( + lcm_rate = uhd::math::lcm<uint32_t>( lcm_rate, static_cast<uint32_t>(floor(this_dsp_rate + 0.5))); } } |