[Bf-blender-cvs] [95b345b2fe4] master: Revert "Cycles: use std::min and max for extra overloads"

[Mai Lavelle]

Commit: 95b345b2fe42573e0fad4c30adb865fd675316fc
Author: Mai Lavelle
Date:   Thu Jul 6 04:21:29 2017 -0400
Branches: master
https://developer.blender.org/rB95b345b2fe42573e0fad4c30adb865fd675316fc

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

We already have this in util_algorithm.h

This reverts commit cff172c7621d89773baa99a9460f19056efb5f1e.

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

M	intern/cycles/util/util_math.h

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

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.