summaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2010-04-14 17:42:39 -0700
committerJosh Blum <josh@joshknows.com>2010-04-14 17:42:39 -0700
commitb9e7e38a84046fc345bcac12611205fbea0bef19 (patch)
tree08d3a26c05f8f2e05fa957bb6d4ed09e7488e9a5 /host/include
parentf57f616cfd6406cd67681813d464695c8c160f9e (diff)
downloaduhd-b9e7e38a84046fc345bcac12611205fbea0bef19.tar.gz
uhd-b9e7e38a84046fc345bcac12611205fbea0bef19.tar.bz2
uhd-b9e7e38a84046fc345bcac12611205fbea0bef19.zip
removed some windows warnings
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/utils/algorithm.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/utils/algorithm.hpp b/host/include/uhd/utils/algorithm.hpp
index cc935b226..8fe9cde82 100644
--- a/host/include/uhd/utils/algorithm.hpp
+++ b/host/include/uhd/utils/algorithm.hpp
@@ -55,8 +55,8 @@ namespace std{
return 0;
}
- template<class T, class T1, class T2> T clip(T val, T1 minVal, T2 maxVal){
- return std::min<T>(std::max<T>(val, minVal), maxVal);
+ template<class T> T clip(T val, T minVal, T maxVal){
+ return std::min(std::max(val, minVal), maxVal);
}
}//namespace std