ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Utils: Fix possible name clash between std::clamp and ZM::clamp 

The naming was ambiguous when compinling in C++17 mode.

(cherry picked from commit a335e740f3)
This commit is contained in:
Peter Keresztes Schmidt 2021-05-17 10:46:50 +02:00
parent 2afbbb17d2
commit 31adca440f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/zm_utils.h
View File

@ -96,7 +96,7 @@ constexpr const T &clamp(const T &v, const T &lo, const T &hi, Compare comp) {
template<class T> template<class T>
constexpr const T &clamp(const T &v, const T &lo, const T &hi) { 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>{});
} }
} }