diff options
| author | Johannes Schickel | 2013-07-30 21:02:01 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2013-07-30 21:02:01 +0200 |
| commit | 2f9b7ba686c8ba763395fbc876a892cc9ea01fd4 (patch) | |
| tree | 576842e26f2b26b4d6cdd8c567caed6864fe9b58 /common | |
| parent | f51f0e5ae80c9c276357bf5d78ad572fa1bf5e7c (diff) | |
| download | scummvm-rg350-2f9b7ba686c8ba763395fbc876a892cc9ea01fd4.tar.gz scummvm-rg350-2f9b7ba686c8ba763395fbc876a892cc9ea01fd4.tar.bz2 scummvm-rg350-2f9b7ba686c8ba763395fbc876a892cc9ea01fd4.zip | |
COMMON: Enforce formatting guidelines a bit more in util.h.
Diffstat (limited to 'common')
| -rw-r--r-- | common/util.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/common/util.h b/common/util.h index 4ca1c42929..392ced1ffe 100644 --- a/common/util.h +++ b/common/util.h @@ -41,10 +41,10 @@ #undef MAX #endif -template<typename T> inline T ABS (T x) { return (x>=0) ? x : -x; } -template<typename T> inline T MIN (T a, T b) { return (a<b) ? a : b; } -template<typename T> inline T MAX (T a, T b) { return (a>b) ? a : b; } -template<typename T> inline T CLIP (T v, T amin, T amax) +template<typename T> inline T ABS(T x) { return (x >= 0) ? x : -x; } +template<typename T> inline T MIN(T a, T b) { return (a < b) ? a : b; } +template<typename T> inline T MAX(T a, T b) { return (a > b) ? a : b; } +template<typename T> inline T CLIP(T v, T amin, T amax) { if (v < amin) return amin; else if (v > amax) return amax; else return v; } /** |