Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--intern/cycles/util/util_math.h4
1 files changed, 0 insertions, 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 <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.