From 31adca440f1f51673c2725a3759cf80d89e9bf81 Mon Sep 17 00:00:00 2001 From: Peter Keresztes Schmidt Date: Mon, 17 May 2021 10:46:50 +0200 Subject: [PATCH] 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 a335e740f3b8abcd3085afaa06820074e4f20e95) --- src/zm_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zm_utils.h b/src/zm_utils.h index 88e00a785..13bbc2dcf 100644 --- 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 constexpr const T &clamp(const T &v, const T &lo, const T &hi) { - return clamp(v, lo, hi, std::less{}); + return ZM::clamp(v, lo, hi, std::less{}); } }