From cff172c7621d89773baa99a9460f19056efb5f1e Mon Sep 17 00:00:00 2001 From: Mai Lavelle Date: Wed, 5 Jul 2017 19:43:34 -0400 Subject: Cycles: use std::min and max for extra overloads --- intern/cycles/util/util_math.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'intern') 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 +# include #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. -- cgit v1.2.3