From 42e13ea4bff4eafb46d16942436b89e166f9d844 Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Wed, 16 Mar 2022 12:25:44 +0100 Subject: Cleanup: Deprecated field access in outliner_duplicate Solved by introducing introducing a variant of MEM_cnew which behaves as a copy-constructor for a trivial types. Alternative approach would be to surround DNA structs with clang/gcc diagnostics push/modify/pop so that implicitly defined constructors and copy operators are allowed to access deprecated fields. The downside of the DNA approach is that it will require some way to easily apply diagnostics modifications to many structs, which is not possible currently. The newly added MEM_cnew has other good usecases, so is easiest to use this route, at least for now. Differential Revision: https://developer.blender.org/D14356 --- intern/guardedalloc/MEM_guardedalloc.h | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'intern') diff --git a/intern/guardedalloc/MEM_guardedalloc.h b/intern/guardedalloc/MEM_guardedalloc.h index d8a8c1181e4..8cd2c9f94dd 100644 --- a/intern/guardedalloc/MEM_guardedalloc.h +++ b/intern/guardedalloc/MEM_guardedalloc.h @@ -278,6 +278,24 @@ template inline T *MEM_cnew(const char *allocation_name) return static_cast(MEM_callocN(sizeof(T), allocation_name)); } +/** + * Allocate memory for an object of type #T and copy construct an object from `other`. + * Only applicable for a trivial types. + * + * This function works around problem of copy-constructing DNA structs which contains deprecated + * fields: some compilers will generate access deprecated field in implicitly defined copy + * constructors. + * + * This is a better alternative to #MEM_dupallocN. + */ +template inline T *MEM_cnew(const char *allocation_name, const T &other) +{ + static_assert(std::is_trivial_v, "For non-trivial types, MEM_new should be used."); + T *new_object = static_cast(MEM_mallocN(sizeof(T), allocation_name)); + memcpy(new_object, &other, sizeof(T)); + return new_object; +} + /** * Destructs and deallocates an object previously allocated with any `MEM_*` function. * Passing in null does nothing. -- cgit v1.2.3