diff options
| author | Josh Blum <josh@joshknows.com> | 2012-02-27 15:45:59 -0800 |
|---|---|---|
| committer | Josh Blum <josh@joshknows.com> | 2012-02-28 13:20:58 -0800 |
| commit | dfaf1f930ce0ff7219c0d10fc0156cba0e46950a (patch) | |
| tree | e0d67976fca62f07d43f9bf7003b85a9b8fdaabb /host/lib/usrp | |
| parent | 2033713db5ca6224bc769747420458287eecc506 (diff) | |
| download | uhd-dfaf1f930ce0ff7219c0d10fc0156cba0e46950a.tar.gz uhd-dfaf1f930ce0ff7219c0d10fc0156cba0e46950a.tar.bz2 uhd-dfaf1f930ce0ff7219c0d10fc0156cba0e46950a.zip | |
uhd: fixed some compile warnings for msvc
Diffstat (limited to 'host/lib/usrp')
| -rw-r--r-- | host/lib/usrp/b100/b100_impl.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_dbsrx2.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/host/lib/usrp/b100/b100_impl.cpp b/host/lib/usrp/b100/b100_impl.cpp index 8b55494c5..7d5ebfa49 100644 --- a/host/lib/usrp/b100/b100_impl.cpp +++ b/host/lib/usrp/b100/b100_impl.cpp @@ -214,7 +214,7 @@ b100_impl::b100_impl(const device_addr_t &device_addr){ _fpga_ctrl->peek32(0); } //try reset once in the case of failure - catch(const uhd::exception &e){ + catch(const uhd::exception &){ if (initialization_count > 1) throw; UHD_MSG(warning) << "The control endpoint was left in a bad state.\n" diff --git a/host/lib/usrp/dboard/db_dbsrx2.cpp b/host/lib/usrp/dboard/db_dbsrx2.cpp index 954d7083d..01eec133f 100644 --- a/host/lib/usrp/dboard/db_dbsrx2.cpp +++ b/host/lib/usrp/dboard/db_dbsrx2.cpp @@ -253,7 +253,7 @@ double dbsrx2::set_lo_freq(double target_freq){ N = (target_freq*R*ext_div)/(ref_freq); //actual spec range is (19, 251) intdiv = int(std::floor(N)); // if (intdiv < 19 or intdiv > 251) continue; - fracdiv = std::floor((N - intdiv)*double(1 << 20)); + fracdiv = boost::math::iround((N - intdiv)*double(1 << 20)); //calculate the actual freq from the values above N = double(intdiv) + double(fracdiv)/double(1 << 20); |