[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42374] trunk/blender/intern/cycles: Fix cycles compile issue after last commit.

[Brecht Van Lommel]

Revision: 42374
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42374
Author:   blendix
Date:     2011-12-03 21:27:19 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Fix cycles compile issue after last commit.

Modified Paths:
--------------
    trunk/blender/intern/cycles/app/cycles_xml.cpp
    trunk/blender/intern/cycles/util/util_boundbox.h
    trunk/blender/intern/cycles/util/util_math.h

Modified: trunk/blender/intern/cycles/app/cycles_xml.cpp
===================================================================
--- trunk/blender/intern/cycles/app/cycles_xml.cpp	2011-12-03 21:01:26 UTC (rev 42373)
+++ trunk/blender/intern/cycles/app/cycles_xml.cpp	2011-12-03 21:27:19 UTC (rev 42374)
@@ -454,7 +454,7 @@
 			xml_read_ustring(&attr->attribute, node, "attribute");
 			snode = attr;
 		}
-		else if(string_ieuals(node.name(), "camera")) {
+		else if(string_iequals(node.name(), "camera")) {
 			snode = new CameraNode();
 		}
 		else if(string_iequals(node.name(), "fresnel")) {

Modified: trunk/blender/intern/cycles/util/util_boundbox.h
===================================================================
--- trunk/blender/intern/cycles/util/util_boundbox.h	2011-12-03 21:01:26 UTC (rev 42373)
+++ trunk/blender/intern/cycles/util/util_boundbox.h	2011-12-03 21:27:19 UTC (rev 42374)
@@ -20,8 +20,8 @@
 #define __UTIL_BOUNDBOX_H__
 
 #include <float.h>
+#include <cmath>
 
-#include "util_math.h"
 #include "util_transform.h"
 #include "util_types.h"
 
@@ -73,8 +73,8 @@
 	bool valid(void) const
 	{
 		return (min.x <= max.x) && (min.y <= max.y) && (min.z <= max.z) &&
-		       !(isnan(min.x) || isnan(min.y) || isnan(min.z)) &&
-		       !(isnan(max.x) || isnan(max.y) || isnan(max.z));
+		       !(std::isnan(min.x) || std::isnan(min.y) || std::isnan(min.z)) &&
+		       !(std::isnan(max.x) || std::isnan(max.y) || std::isnan(max.z));
 	}
 
 	BoundBox transformed(const Transform *tfm)

Modified: trunk/blender/intern/cycles/util/util_math.h
===================================================================
--- trunk/blender/intern/cycles/util/util_math.h	2011-12-03 21:01:26 UTC (rev 42373)
+++ trunk/blender/intern/cycles/util/util_math.h	2011-12-03 21:27:19 UTC (rev 42374)
@@ -63,7 +63,6 @@
 #if(!defined(FREE_WINDOWS))
 #define copysignf(x, y) ((float)_copysign(x, y))
 #define hypotf(x, y) _hypotf(x, y)
-#define isnan(x) _isnan(x)
 #endif
 
 #endif