diff options
| author | 2018-04-19 23:01:50 -0400 | |
|---|---|---|
| committer | 2018-04-20 10:14:13 -0400 | |
| commit | fae2dd034462c5a6b086e46b3437ea6e2456d5eb (patch) | |
| tree | 3a53e7b4786e4712874d63a2a1cecc6755475051 /src/common/math_util.h | |
| parent | Merge pull request #356 from lioncash/shader (diff) | |
| download | yuzu-fae2dd034462c5a6b086e46b3437ea6e2456d5eb.tar.gz yuzu-fae2dd034462c5a6b086e46b3437ea6e2456d5eb.tar.xz yuzu-fae2dd034462c5a6b086e46b3437ea6e2456d5eb.zip | |
math_util: Remove the Clamp() function
C++17 adds clamp() to the standard library, so we can remove ours in
favor of it.
Diffstat (limited to '')
| -rw-r--r-- | src/common/math_util.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/src/common/math_util.h b/src/common/math_util.h index 45a1ed367..c6a83c953 100644 --- a/src/common/math_util.h +++ b/src/common/math_util.h | |||
| @@ -17,11 +17,6 @@ inline bool IntervalsIntersect(unsigned start0, unsigned length0, unsigned start | |||
| 17 | return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); | 17 | return (std::max(start0, start1) < std::min(start0 + length0, start1 + length1)); |
| 18 | } | 18 | } |
| 19 | 19 | ||
| 20 | template <typename T> | ||
| 21 | inline T Clamp(const T val, const T& min, const T& max) { | ||
| 22 | return std::max(min, std::min(max, val)); | ||
| 23 | } | ||
| 24 | |||
| 25 | template <class T> | 20 | template <class T> |
| 26 | struct Rectangle { | 21 | struct Rectangle { |
| 27 | T left; | 22 | T left; |