diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-10 23:45:08 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2011-08-10 23:45:08 +0400 |
| commit | 18d709022e3ad2208382157a566095c406504d24 (patch) | |
| tree | 0aedcf71b82e2e95ad0a7a03a79d44f0511e8a16 /intern/cycles | |
| parent | b98ccf699878d70b7cbfdd7863440c34326a5569 (diff) | |
Cycles: clang build fixes.
Diffstat (limited to 'intern/cycles')
| -rw-r--r-- | intern/cycles/bvh/bvh.h | 1 | ||||
| -rw-r--r-- | intern/cycles/bvh/bvh_node.h | 1 | ||||
| -rw-r--r-- | intern/cycles/device/device_multi.cpp | 2 | ||||
| -rw-r--r-- | intern/cycles/subd/subd_patch.h | 1 | ||||
| -rw-r--r-- | intern/cycles/util/util_vector.h | 1 |
5 files changed, 5 insertions, 1 deletions
diff --git a/intern/cycles/bvh/bvh.h b/intern/cycles/bvh/bvh.h index 6b877594422..79e46d6a13c 100644 --- a/intern/cycles/bvh/bvh.h +++ b/intern/cycles/bvh/bvh.h @@ -83,6 +83,7 @@ public: vector<Object*> objects; static BVH *create(const BVHParams& params, const vector<Object*>& objects); + virtual ~BVH() {} void build(Progress& progress); void refit(Progress& progress); diff --git a/intern/cycles/bvh/bvh_node.h b/intern/cycles/bvh/bvh_node.h index d83c006b93d..f8f0ffecd95 100644 --- a/intern/cycles/bvh/bvh_node.h +++ b/intern/cycles/bvh/bvh_node.h @@ -42,6 +42,7 @@ public: { } + virtual ~BVHNode() {} virtual bool is_leaf() const = 0; virtual int num_children() const = 0; virtual BVHNode *get_child(int i) const = 0; diff --git a/intern/cycles/device/device_multi.cpp b/intern/cycles/device/device_multi.cpp index 26c9717233a..e48df93737d 100644 --- a/intern/cycles/device/device_multi.cpp +++ b/intern/cycles/device/device_multi.cpp @@ -244,7 +244,7 @@ public: 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(); diff --git a/intern/cycles/subd/subd_patch.h b/intern/cycles/subd/subd_patch.h index 8d4b8a1c911..ac2317f4359 100644 --- a/intern/cycles/subd/subd_patch.h +++ b/intern/cycles/subd/subd_patch.h @@ -30,6 +30,7 @@ class Mesh; 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; diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h index fb872936e3f..931ad272612 100644 --- a/intern/cycles/util/util_vector.h +++ b/intern/cycles/util/util_vector.h @@ -21,6 +21,7 @@ /* Vector */ +#include <string.h> #include <vector> CCL_NAMESPACE_BEGIN |