diff options
author | Josh Blum <josh@joshknows.com> | 2010-08-19 17:15:30 -0700 |
---|---|---|
committer | Josh Blum <josh@joshknows.com> | 2010-08-19 17:15:30 -0700 |
commit | a32c3217cb703430f417cf5a3b816f6fd0f70ed3 (patch) | |
tree | b50b370c4ce9a50c1218e1f5b2ff773840fb2d2f /host/lib/usrp/usrp2 | |
parent | 0f2bf7bf709f417e0ef5a0860e18b190f740fd1b (diff) | |
parent | d99e22971975e9b5bfb966741684963be8f049f6 (diff) | |
download | uhd-a32c3217cb703430f417cf5a3b816f6fd0f70ed3.tar.gz uhd-a32c3217cb703430f417cf5a3b816f6fd0f70ed3.tar.bz2 uhd-a32c3217cb703430f417cf5a3b816f6fd0f70ed3.zip |
Merge branch 'master' into usrp1
Diffstat (limited to 'host/lib/usrp/usrp2')
-rw-r--r-- | host/lib/usrp/usrp2/dsp_impl.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/host/lib/usrp/usrp2/dsp_impl.cpp b/host/lib/usrp/usrp2/dsp_impl.cpp index 347ec38af..6422142ce 100644 --- a/host/lib/usrp/usrp2/dsp_impl.cpp +++ b/host/lib/usrp/usrp2/dsp_impl.cpp @@ -31,9 +31,10 @@ static const size_t default_interp = 16; /*********************************************************************** * DDC Helper Methods **********************************************************************/ -static unsigned pick_closest_rate(double exact_rate, const std::vector<unsigned> &rates){ +template <typename rate_type> +static rate_type pick_closest_rate(double exact_rate, const std::vector<rate_type> &rates){ unsigned closest_match = rates.front(); - BOOST_FOREACH(unsigned possible_rate, rates){ + BOOST_FOREACH(rate_type possible_rate, rates){ if(std::abs(exact_rate - possible_rate) < std::abs(exact_rate - closest_match)) closest_match = possible_rate; } |