diff options
| author | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 11:21:29 +0300 |
|---|---|---|
| committer | Mai Lavelle <mai.lavelle@gmail.com> | 2017-07-06 11:21:29 +0300 |
| commit | 95b345b2fe42573e0fad4c30adb865fd675316fc (patch) | |
| tree | 0bac309350501ceb0102f22843e8b26763bfe9f3 /intern | |
| parent | f9963f29e8beac1336a053ca642ebb03b4e123e2 (diff) | |
Revert "Cycles: use std::min and max for extra overloads"
We already have this in util_algorithm.h
This reverts commit cff172c7621d89773baa99a9460f19056efb5f1e.
Diffstat (limited to 'intern')
| -rw-r--r-- | intern/cycles/util/util_math.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h index a3a2f8e7da7..b719640b19c 100644 --- a/intern/cycles/util/util_math.h +++ b/intern/cycles/util/util_math.h @@ -24,7 +24,6 @@ #ifndef __KERNEL_GPU__ # include <cmath> -# include <algorithm> #endif @@ -131,9 +130,6 @@ 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. |