From 95b345b2fe42573e0fad4c30adb865fd675316fc Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Thu, 6 Jul 2017 04:21:29 -0400 Subject: Revert "Cycles: use std::min and max for extra overloads" We already have this in util_algorithm.h This reverts commit cff172c7621d89773baa99a9460f19056efb5f1e. --- intern/cycles/util/util_math.h | 4 ---- 1 file changed, 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 -# include #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. -- cgit v1.2.3