From 64be8c15070b8854087706ebca371c7f49fb53af Mon Sep 17 00:00:00 2001 From: George Marques Date: Sat, 28 Jan 2023 13:59:34 -0300 Subject: [PATCH] Use std type traits instead of intrinsics This removes warnings and mimics what has been done in Godot itself. --- include/godot_cpp/core/memory.hpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/godot_cpp/core/memory.hpp b/include/godot_cpp/core/memory.hpp index 4a5a16b..d17e05e 100644 --- a/include/godot_cpp/core/memory.hpp +++ b/include/godot_cpp/core/memory.hpp @@ -108,7 +108,7 @@ public: template void memdelete(T *p_class, typename std::enable_if>::type * = nullptr) { - if (!__has_trivial_destructor(T)) { + if (!std::is_trivially_destructible::value) { p_class->~T(); } @@ -122,7 +122,7 @@ void memdelete(T *p_class) { template void memdelete_allocator(T *p_class) { - if (!__has_trivial_destructor(T)) { + if (!std::is_trivially_destructible::value) { p_class->~T(); } @@ -145,7 +145,7 @@ T *memnew_arr_template(size_t p_elements, const char *p_descr = "") { ERR_FAIL_COND_V(!mem, failptr); *(mem - 1) = p_elements; - if (!__has_trivial_constructor(T)) { + if (!std::is_trivially_destructible::value) { T *elems = (T *)mem; /* call operator new */ @@ -161,7 +161,7 @@ template void memdelete_arr(T *p_class) { uint64_t *ptr = (uint64_t *)p_class; - if (!__has_trivial_destructor(T)) { + if (!std::is_trivially_destructible::value) { uint64_t elem_count = *(ptr - 1); for (uint64_t i = 0; i < elem_count; i++) {