[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [39270] branches/cycles/intern/cycles: Cycles: clang build fixes.

Brecht Van Lommel brechtvanlommel at pandora.be
Wed Aug 10 21:45:08 CEST 2011


Revision: 39270
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=39270
Author:   blendix
Date:     2011-08-10 19:45:08 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
Cycles: clang build fixes.

Modified Paths:
--------------
    branches/cycles/intern/cycles/bvh/bvh.h
    branches/cycles/intern/cycles/bvh/bvh_node.h
    branches/cycles/intern/cycles/device/device_multi.cpp
    branches/cycles/intern/cycles/subd/subd_patch.h
    branches/cycles/intern/cycles/util/util_vector.h

Modified: branches/cycles/intern/cycles/bvh/bvh.h
===================================================================
--- branches/cycles/intern/cycles/bvh/bvh.h	2011-08-10 19:43:40 UTC (rev 39269)
+++ branches/cycles/intern/cycles/bvh/bvh.h	2011-08-10 19:45:08 UTC (rev 39270)
@@ -83,6 +83,7 @@
 	vector<Object*> objects;
 
 	static BVH *create(const BVHParams& params, const vector<Object*>& objects);
+	virtual ~BVH() {}
 
 	void build(Progress& progress);
 	void refit(Progress& progress);

Modified: branches/cycles/intern/cycles/bvh/bvh_node.h
===================================================================
--- branches/cycles/intern/cycles/bvh/bvh_node.h	2011-08-10 19:43:40 UTC (rev 39269)
+++ branches/cycles/intern/cycles/bvh/bvh_node.h	2011-08-10 19:45:08 UTC (rev 39270)
@@ -42,6 +42,7 @@
 	{
 	}
 
+	virtual ~BVHNode() {}
 	virtual bool is_leaf() const = 0;
 	virtual int num_children() const = 0;
 	virtual BVHNode *get_child(int i) const = 0;

Modified: branches/cycles/intern/cycles/device/device_multi.cpp
===================================================================
--- branches/cycles/intern/cycles/device/device_multi.cpp	2011-08-10 19:43:40 UTC (rev 39269)
+++ branches/cycles/intern/cycles/device/device_multi.cpp	2011-08-10 19:45:08 UTC (rev 39270)
@@ -244,7 +244,7 @@
 		mem.device_pointer = tmp;
 	}
 
-	void draw_pixels(device_memory& rgba, int x, int y, int w, int h, int width, int height)
+	void draw_pixels(device_memory& rgba, int y, int w, int h, int width, int height)
 	{
 		device_ptr tmp = rgba.device_pointer;
 		int i = 0, sub_h = h/devices.size();

Modified: branches/cycles/intern/cycles/subd/subd_patch.h
===================================================================
--- branches/cycles/intern/cycles/subd/subd_patch.h	2011-08-10 19:43:40 UTC (rev 39269)
+++ branches/cycles/intern/cycles/subd/subd_patch.h	2011-08-10 19:45:08 UTC (rev 39270)
@@ -30,6 +30,7 @@
 
 class Patch {
 public:
+	virtual ~Patch() {}
 	virtual void eval(float3 *P, float3 *dPdu, float3 *dPdv, float u, float v) = 0;
 	virtual bool is_triangle() = 0;
 	virtual BoundBox bound() = 0;

Modified: branches/cycles/intern/cycles/util/util_vector.h
===================================================================
--- branches/cycles/intern/cycles/util/util_vector.h	2011-08-10 19:43:40 UTC (rev 39269)
+++ branches/cycles/intern/cycles/util/util_vector.h	2011-08-10 19:45:08 UTC (rev 39270)
@@ -21,6 +21,7 @@
 
 /* Vector */
 
+#include <string.h>
 #include <vector>
 
 CCL_NAMESPACE_BEGIN




More information about the Bf-blender-cvs mailing list