[Bf-blender-cvs] [254fbcdd7b] master: Cycles: Fix compilation error on with older GCC

[Sergey Sharybin]

Commit: 254fbcdd7b638943acc033c081ca729954f2b5a0
Author: Sergey Sharybin
Date:   Fri Jan 20 11:55:48 2017 +0100
Branches: master
https://developer.blender.org/rB254fbcdd7b638943acc033c081ca729954f2b5a0

Cycles: Fix compilation error on with older GCC

Hopefully it works on all platforms now.

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

M	intern/cycles/util/util_math.h

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

diff --git a/intern/cycles/util/util_math.h b/intern/cycles/util/util_math.h
index d006264641..2b81c8c498 100644
--- a/intern/cycles/util/util_math.h
+++ b/intern/cycles/util/util_math.h
@@ -22,6 +22,11 @@
  * Basic math functions on scalar and vector types. This header is used by
  * both the kernel code when compiled as C++, and other C++ non-kernel code. */
 
+#ifndef __KERNEL_GPU__
+#  include <cmath>
+#endif
+
+
 #ifndef __KERNEL_OPENCL__
 
 #include <float.h>
@@ -97,6 +102,9 @@ ccl_device_inline float fminf(float a, float b)
 
 #ifndef __KERNEL_GPU__
 
+using std::isfinite;
+using std::isnan;
+
 ccl_device_inline int abs(int x)
 {
 	return (x > 0)? x: -x;