aboutsummaryrefslogtreecommitdiffstats
path: root/host/lib/utils
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2011-02-24 17:28:10 -0800
committerJosh Blum <josh@joshknows.com>2011-02-24 17:28:10 -0800
commit1526889803f2fc909d97c16b59323107db184381 (patch)
tree9f7d5a86a6a7b232375e9f1bc4c657b629906abb /host/lib/utils
parent4357f5d3c043245b5c086b20742795624af9f432 (diff)
downloaduhd-1526889803f2fc909d97c16b59323107db184381.tar.gz
uhd-1526889803f2fc909d97c16b59323107db184381.tar.bz2
uhd-1526889803f2fc909d97c16b59323107db184381.zip
uhd: switch algorithm namespace to uhd
Diffstat (limited to 'host/lib/utils')
-rw-r--r--host/lib/utils/gain_group.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index 101620a33..3af8a543d 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -107,7 +107,7 @@ public:
double gain_left_to_distribute = gain;
BOOST_FOREACH(const gain_fcns_t &fcns, all_fcns){
const gain_range_t range = fcns.get_range();
- gain_bucket.push_back(floor_step(std::clip(
+ gain_bucket.push_back(floor_step(uhd::clip(
gain_left_to_distribute, range.start(), range.stop()
), max_step));
gain_left_to_distribute -= gain_bucket.back();
@@ -131,7 +131,7 @@ public:
//fill in the largest step sizes first that are less than the remainder
BOOST_FOREACH(size_t i, indexes_step_size_dec){
const gain_range_t range = all_fcns.at(i).get_range();
- double additional_gain = floor_step(std::clip(
+ double additional_gain = floor_step(uhd::clip(
gain_bucket.at(i) + gain_left_to_distribute, range.start(), range.stop()
), range.step()) - gain_bucket.at(i);
gain_bucket.at(i) += additional_gain;
@@ -167,7 +167,7 @@ private:
//! get the gain function sets in order (highest priority first)
std::vector<gain_fcns_t> get_all_fcns(void){
std::vector<gain_fcns_t> all_fcns;
- BOOST_FOREACH(size_t key, std::sorted(_registry.keys())){
+ BOOST_FOREACH(size_t key, uhd::sorted(_registry.keys())){
const std::vector<gain_fcns_t> &fcns = _registry[key];
all_fcns.insert(all_fcns.begin(), fcns.begin(), fcns.end());
}