From a6e582164f11c618a324dad1a2ae2c73cbc85b77 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Mon, 11 Jun 2018 12:53:11 +0200 Subject: 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. --- intern/libmv/libmv/base/vector.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(allocate(size)); - memcpy(data, data_, sizeof(*data)*size_); + memcpy(static_cast(data), data_, sizeof(*data)*size_); allocator_.deallocate(data_, capacity_); data_ = data; capacity_ = size; -- cgit v1.2.3