sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

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

Browse Source 
We already have this in util_algorithm.h

This reverts commit cff172c7621d89773baa99a9460f19056efb5f1e.
This commit is contained in:
Mai Lavelle 2017-07-06 04:21:29 -04:00
parent f9963f29e8
commit 95b345b2fe
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intern/cycles/util/util_math.h
View File

@ -24,7 +24,6 @@
#ifndef __KERNEL_GPU__ #ifndef __KERNEL_GPU__
# include <cmath> # include <cmath>
# include <algorithm>
#endif #endif
@ -131,9 +130,6 @@ ccl_device_inline double min(double a, double b)
return (a < b)? a: b; return (a < b)? a: b;
} }
using std::min;
using std::max;
/* These 2 guys are templated for usage with registers data. /* These 2 guys are templated for usage with registers data.
* *
* NOTE: Since this is CPU-only functions it is ok to use references here. * NOTE: Since this is CPU-only functions it is ok to use references here.