From f3b83301826fff82ad2deff035460811a4adc176 Mon Sep 17 00:00:00 2001 From: Relintai Date: Mon, 31 Mar 2025 10:44:03 +0200 Subject: [PATCH] Use HAS_TRIVIAL_DESTRUCTOR macro instead of std::is_trivially_destructible. --- core/config/project_settings.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/config/project_settings.h b/core/config/project_settings.h index 3f0b5b524..5ed3cdf6b 100644 --- a/core/config/project_settings.h +++ b/core/config/project_settings.h @@ -35,6 +35,7 @@ #include "core/containers/rb_set.h" #include "core/object/object.h" #include "core/os/thread_safe.h" +#include "core/typedefs.h" // Querying ProjectSettings is usually done at startup. // Additionally, in order to keep track of changes to ProjectSettings, @@ -227,7 +228,7 @@ Variant _GLOBAL_DEF_ALIAS(const String &p_var, const String &p_old_name, const V // Cached versions of GLOBAL_GET. // Cached but uses a typed variable for storage, this can be more efficient. #define GLOBAL_GET_CACHED(m_type, m_setting_name) ([](const char *p_name) -> m_type {\ -static_assert(std::is_trivially_destructible::value, "GLOBAL_GET_CACHED must use a trivial type that allows static lifetime.");\ +static_assert(HAS_TRIVIAL_DESTRUCTOR(m_type), "GLOBAL_GET_CACHED must use a trivial type that allows static lifetime.");\ static m_type local_var;\ static uint32_t local_version = 0;\ static Mutex local_mutex;\