Add some type-check to MEM_freeN<T> with MSVC.
Using `DNA_DEFINE_CXX_METHODS` in DNA structs make them non-trivially copyable for MSVC, so use a narrower check that should still catch most issues. Pull Request: https://projects.blender.org/blender/blender/pulls/134875
This commit is contained in:
committed by
Bastien Montagne
parent
3969e30c6f
commit
718d4ffe9f
@@ -399,11 +399,14 @@ template<typename T> inline T *MEM_cnew(const char *allocation_name, const T &ot
|
||||
|
||||
template<typename T> inline void MEM_freeN(T *ptr)
|
||||
{
|
||||
# ifndef _MSC_VER
|
||||
# ifdef _MSC_VER
|
||||
/* MSVC seems to consider C-style types using the DNA_DEFINE_CXX_METHODS as non-trivial. GCC
|
||||
* and clang (both on linux, OSX and clang-cl on Windows on Arm) do not.
|
||||
*
|
||||
* So for now, disable the triviality check on MSVC. */
|
||||
static_assert(std::is_trivially_destructible_v<T>,
|
||||
"For non-trivial types, MEM_delete must be used.");
|
||||
# else
|
||||
static_assert(std::is_trivial_v<T>, "For non-trivial types, MEM_delete must be used.");
|
||||
# endif
|
||||
mem_guarded::internal::mem_freeN_ex(const_cast<void *>(static_cast<const void *>(ptr)),
|
||||
|
||||
Reference in New Issue
Block a user