diff options
| author | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
|---|---|---|
| committer | Ashish Chaudhari <ashish@ettus.com> | 2015-04-21 10:40:37 -0700 |
| commit | 893819c87f1cc9e845e29df0c26e1d2d0012b750 (patch) | |
| tree | a300f39af94d6831df2bdee9ea0518dba949bb59 /host/lib/usrp/usrp1/codec_ctrl.cpp | |
| parent | 625724d7f81c214e9955334860a364802be3fda9 (diff) | |
| parent | 6e918dab8c3dbdc9774389812953cc495496a8e8 (diff) | |
| download | uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.gz uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.tar.bz2 uhd-893819c87f1cc9e845e29df0c26e1d2d0012b750.zip | |
Merge branch 'master' into vivado
Conflicts:
host/lib/usrp/x300/x300_clock_ctrl.cpp
Diffstat (limited to 'host/lib/usrp/usrp1/codec_ctrl.cpp')
| -rw-r--r-- | host/lib/usrp/usrp1/codec_ctrl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/usrp/usrp1/codec_ctrl.cpp b/host/lib/usrp/usrp1/codec_ctrl.cpp index 2e922a3e2..8ba7b54ca 100644 --- a/host/lib/usrp/usrp1/codec_ctrl.cpp +++ b/host/lib/usrp/usrp1/codec_ctrl.cpp @@ -357,7 +357,7 @@ double usrp1_codec_ctrl_impl::fine_tune(double codec_rate, double target_freq) static const double scale_factor = std::pow(2.0, 24); boost::uint32_t freq_word = boost::uint32_t( - boost::math::round(abs((target_freq / codec_rate) * scale_factor))); + boost::math::round(std::abs((target_freq / codec_rate) * scale_factor))); double actual_freq = freq_word * codec_rate / scale_factor; |