mirror/zoneminder
1
0
Fork 0
mirror of https://github.com/ZoneMinder/zoneminder.git synced 2026-05-18 19:46:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3246 from Carbenium/1.36-gcc11

Browse Source 
[Backport 1.36] Utils: Fix possible name clash between std::clamp and ZM::clamp
This commit is contained in:
Isaac Connor
2021-05-19 13:32:49 -04:00
committed by GitHub
parent 2afbbb17d2 31adca440f
commit d1002fbf91
1 changed files with 1 additions and 1 deletions
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>
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>{});
}
}