[Bf-blender-cvs] [cff172c7621] master: Cycles: use std::min and max for extra overloads

[Mai Lavelle]

Commit: cff172c7621d89773baa99a9460f19056efb5f1e
Author: Mai Lavelle
Date:   Wed Jul 5 19:43:34 2017 -0400
Branches: master
https://developer.blender.org/rBcff172c7621d89773baa99a9460f19056efb5f1e

Cycles: use std::min and max for extra overloads

===================================================================

M	intern/cycles/util/util_math.h

===================================================================

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.