diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-11 13:53:11 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2018-06-11 14:02:10 +0300 |
commit | a6e582164f11c618a324dad1a2ae2c73cbc85b77 (patch) | |
tree | 61925718665a3c73fee6b2c6cceb0fc39dbaf162 /intern/libmv | |
parent | d0956e9cb3077971a9ae6c1ba9560604d5ad1ef7 (diff) |
Libmv: Cleanup, make strict compiler more happy
In C++ it is not really safe to memcpy objects, and newer GCC will warn
about this. However, we don't use our vector for unsafe-to-memcpy objects,
so just explicitly silence that warning.
Diffstat (limited to 'intern/libmv')
-rw-r--r-- | intern/libmv/libmv/base/vector.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h index 1931fb0b1f9..bdc4392155c 100644 --- a/intern/libmv/libmv/base/vector.h +++ b/intern/libmv/libmv/base/vector.h @@ -121,7 +121,7 @@ class vector { void reserve(unsigned int size) { if (size > size_) { T *data = static_cast<T *>(allocate(size)); - memcpy(data, data_, sizeof(*data)*size_); + memcpy(static_cast<void *>(data), data_, sizeof(*data)*size_); allocator_.deallocate(data_, capacity_); data_ = data; capacity_ = size; |