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/include/uhdlib/usrp | |
| 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/include/uhdlib/usrp')
| -rw-r--r-- | host/lib/include/uhdlib/usrp/common/adf535x.hpp | 9 | ||||
| -rw-r--r-- | host/lib/include/uhdlib/usrp/common/lmx2592.hpp | 1 |
2 files changed, 4 insertions, 6 deletions
diff --git a/host/lib/include/uhdlib/usrp/common/adf535x.hpp b/host/lib/include/uhdlib/usrp/common/adf535x.hpp index 200610d02..6350261ef 100644 --- a/host/lib/include/uhdlib/usrp/common/adf535x.hpp +++ b/host/lib/include/uhdlib/usrp/common/adf535x.hpp @@ -15,7 +15,6 @@ #include <stdint.h> #include <boost/format.hpp> #include <boost/function.hpp> -#include <boost/math/common_factor_rt.hpp> //gcd #include <algorithm> #include <utility> #include <vector> @@ -376,8 +375,8 @@ inline double adf535x_impl<adf5355_regs_t>::_set_frequency( const auto FRAC1 = static_cast<uint32_t>(floor((N - INT) * ADF535X_MOD1)); const double residue = (N - INT) * ADF535X_MOD1 - FRAC1; - const double gcd = - boost::math::gcd(static_cast<int>(_pfd_freq), static_cast<int>(freq_resolution)); + const double gcd = double( + uhd::math::gcd(static_cast<int>(_pfd_freq), static_cast<int>(freq_resolution))); const auto MOD2 = static_cast<uint16_t>( std::min(floor(_pfd_freq / gcd), static_cast<double>(ADF535X_MAX_MOD2))); const auto FRAC2 = static_cast<uint16_t>( @@ -491,8 +490,8 @@ inline double adf535x_impl<adf5356_regs_t>::_set_frequency( const auto FRAC1 = static_cast<uint32_t>(floor((N - INT) * ADF535X_MOD1)); const double residue = (N - INT) * ADF535X_MOD1 - FRAC1; - const double gcd = - boost::math::gcd(static_cast<int>(_pfd_freq), static_cast<int>(freq_resolution)); + const double gcd = double( + uhd::math::gcd(static_cast<int>(_pfd_freq), static_cast<int>(freq_resolution))); const auto MOD2 = static_cast<uint16_t>( std::min(floor(_pfd_freq / gcd), static_cast<double>(ADF535X_MAX_MOD2))); const auto FRAC2 = static_cast<uint16_t>( diff --git a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp index f71ae0cf5..181b81269 100644 --- a/host/lib/include/uhdlib/usrp/common/lmx2592.hpp +++ b/host/lib/include/uhdlib/usrp/common/lmx2592.hpp @@ -13,7 +13,6 @@ #include <uhd/utils/safe_call.hpp> #include <boost/format.hpp> #include <boost/function.hpp> -#include <boost/math/common_factor_rt.hpp> //gcd #include <algorithm> #include <cstdint> #include <utility> |