Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename clamp macro to Clamp to fix compilation with g++11 (and clamp2 for consistency sake)

Browse Source
This commit is contained in:
withmorten
2021-06-28 13:57:05 +02:00
parent f8297df9c5
commit d17d437de3
41 changed files with 189 additions and 189 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/common.h
View File

@@ -289,9 +289,9 @@ extern int strncasecmp(const char *str1, const char *str2, size_t len);
extern wchar *AllocUnicode(const char*src);
#define clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
#define Clamp(v, low, high) ((v)<(low) ? (low) : (v)>(high) ? (high) : (v))
#define clamp2(v, center, radius) ((v) < (center) ? Max(v, center - radius) : Min(v, center + radius))
#define Clamp2(v, center, radius) ((v) < (center) ? Max(v, center - radius) : Min(v, center + radius))
inline float sq(float x) { return x*x; }
#define SQR(x) ((x) * (x))