Fix cycles compile issue after last commit.
authorBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 3 Dec 2011 21:27:19 +0000 (21:27 +0000)
committerBrecht Van Lommel <brechtvanlommel@pandora.be>
Sat, 3 Dec 2011 21:27:19 +0000 (21:27 +0000)
intern/cycles/app/cycles_xml.cpp
intern/cycles/util/util_boundbox.h
intern/cycles/util/util_math.h

index 8abc060af4727f40478e5c46365db059353ee899..7cd190f877d3c27a817d938a7958b72c152d407f 100644 (file)
@@ -454,7 +454,7 @@ static void xml_read_shader_graph(const XMLReadState& state, Shader *shader, pug
                        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")) {
index b4c5e4e71ca84d9b46e1901d344a66eacf271db1..24ea3655576d69cc93ff11f89fdb2022d7f6a036 100644 (file)
@@ -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 @@ public:
        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)
index 7c56f0fbb124fcc10eb435766998044fe07842d7..2f9e00dbfcbab08e7159b8f8f32a1ae781d01865 100644 (file)
@@ -63,7 +63,6 @@ CCL_NAMESPACE_BEGIN
 #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