diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 02:43:34 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 02:43:34 +0300 |
| commit | cff172c7621d89773baa99a9460f19056efb5f1e (patch) | |
| tree | 2cd9576f11931f20eaf63d573ee06377db855d2d /intern | |
| parent | aea44561017ccfba58bd97741dde1508aa826a44 (diff) | |
Cycles: use std::min and max for extra overloads
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_math.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index b719640b19c..a3a2f8e7da7 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -24,6 +24,7 @@ #ifndef __KERNEL_GPU__ # include <cmath> +# include <algorithm> #endif @@ -130,6 +131,9 @@ ccl_device_inline double min(double a, double b) return (a < b)? a: b; } +using std::min; +using std::max; + /* These 2 guys are templated for usage with registers data. * * NOTE: Since this is CPU-only functions it is ok to use references here. |