Merge pull request #3246 from Carbenium/1.36-gcc11

[Backport 1.36] Utils: Fix possible name clash between std::clamp and ZM::clamp
2021-05-19 13:32:49 -04:00 · 2021-05-19 13:32:49 -04:00 · d1002fbf91
parent 2afbbb17d2 31adca440f
commit d1002fbf91
1 changed files with 1 additions and 1 deletions
--- a/src/zm_utils.h
+++ b/src/zm_utils.h
@ -96,7 +96,7 @@ constexpr const T &clamp(const T &v, const T &lo, const T &hi, Compare comp) {

 template<class T>
 constexpr const T &clamp(const T &v, const T &lo, const T &hi) {
-  return clamp(v, lo, hi, std::less<T>{});
+  return ZM::clamp(v, lo, hi, std::less<T>{});
 }
 }