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:
authorTon Roosendaal <ton@blender.org>2009-10-19 21:47:24 +0400
committerTon Roosendaal <ton@blender.org>2009-10-19 21:47:24 +0400
commit401c185fbc80d2ab01de1789bdb02701aa1804f6 (patch)
treed24a333656983a3bd1d0b2bef0eb3a62b2ce8367 /source/blender/render
parent031da438e47a2cf88bf81f7c2c7a3274cfe97e63 (diff)
Get 2.5 trunk to compile. this C++ code failed for gcc 3.3.
Error log: /usr/include/gcc/darwin/3.3/c++/cmath: In function `float std::ceil(float)': /usr/include/gcc/darwin/3.3/c++/cmath:175: error: parse error before `(' token /usr/include/gcc/darwin/3.3/c++/cmath: In function `float std::floor(float)': /usr/include/gcc/darwin/3.3/c++/cmath:249: error: parse error before `(' token /usr/include/gcc/darwin/3.3/c++/cmath: In function `float std::fmod(float, float)': /usr/include/gcc/darwin/3.3/c++/cmath:267: error: parse error before `(' token
Diffstat (limited to 'source/blender/render')
-rw-r--r--source/blender/render/intern/raytrace/reorganize.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/render/intern/raytrace/reorganize.h b/source/blender/render/intern/raytrace/reorganize.h
index f0335b769d5..6bf31014712 100644
--- a/source/blender/render/intern/raytrace/reorganize.h
+++ b/source/blender/render/intern/raytrace/reorganize.h
@@ -26,9 +26,10 @@
*
* ***** END GPL LICENSE BLOCK *****
*/
+
#include <stdio.h>
-#include <math.h>
#include <algorithm>
+#include <math.h>
#include <vector>
#include <queue>
@@ -289,7 +290,6 @@ float bvh_refit(Node *node)
* with the purpose to reduce the expected cost (eg.: number of BB tests).
*/
#include <vector>
-#include <cmath>
#define MAX_CUT_SIZE 16
#define MAX_OPTIMIZE_CHILDS MAX_CUT_SIZE