diff options
Diffstat (limited to 'intern/cycles/util/util_vector.h')
| -rw-r--r-- | intern/cycles/util/util_vector.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h index e98e4e34181..8d91d3936a4 100644 --- a/intern/cycles/util/util_vector.h +++ b/intern/cycles/util/util_vector.h @@ -131,7 +131,7 @@ public: { if(this != &from) { resize(from.size()); - memcpy(data_, from.data_, datasize_*sizeof(T)); + memcpy((void*)data_, from.data_, datasize_*sizeof(T)); } return *this; @@ -204,7 +204,9 @@ public: return NULL; } else if(data_ != NULL) { - memcpy(newdata, data_, ((datasize_ < newsize)? datasize_: newsize)*sizeof(T)); + memcpy((void *)newdata, + data_, + ((datasize_ < newsize)? datasize_: newsize)*sizeof(T)); mem_free(data_, capacity_); } data_ = newdata; |