[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23977] trunk/blender/source/blender/ render/intern/raytrace/reorganize.h: Get 2.5 trunk to compile.

Ton Roosendaal ton at blender.org
Mon Oct 19 19:47:24 CEST 2009


Revision: 23977
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23977
Author:   ton
Date:     2009-10-19 19:47:24 +0200 (Mon, 19 Oct 2009)

Log Message:
-----------
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

Modified Paths:
--------------
    trunk/blender/source/blender/render/intern/raytrace/reorganize.h

Modified: trunk/blender/source/blender/render/intern/raytrace/reorganize.h
===================================================================
--- trunk/blender/source/blender/render/intern/raytrace/reorganize.h	2009-10-19 17:20:09 UTC (rev 23976)
+++ trunk/blender/source/blender/render/intern/raytrace/reorganize.h	2009-10-19 17:47:24 UTC (rev 23977)
@@ -26,9 +26,10 @@
  *
  * ***** END GPL LICENSE BLOCK *****
  */
+
 #include <stdio.h>
+#include <algorithm>
 #include <math.h>
-#include <algorithm>
 #include <vector>
 #include <queue>
 
@@ -289,7 +290,6 @@
  * 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
 





More information about the Bf-blender-cvs mailing list