From 7c0db3203bc9ee910fb2e4746e58e1c6809686c6 Mon Sep 17 00:00:00 2001 From: Tom Yaxley Date: Fri, 20 Nov 2020 19:32:53 +1100 Subject: [PATCH] meta: allow checking meta_any for nullptr (#591) --- src/entt/meta/meta.hpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/entt/meta/meta.hpp b/src/entt/meta/meta.hpp index 106a9c375..b3e0cb216 100644 --- a/src/entt/meta/meta.hpp +++ b/src/entt/meta/meta.hpp @@ -171,9 +171,11 @@ class meta_any { using pointed_type = std::remove_reference_t())>; if constexpr(std::is_const_v && std::is_copy_constructible_v) { - return std::as_const(*any.cast()); + auto ptr = any.cast(); + return ptr ? std::as_const(*ptr) : meta_any{}; } else if constexpr(!std::is_const_v) { - return std::ref(*any.cast()); + auto ptr = any.cast(); + return ptr ? std::ref(*ptr) : meta_any{}; } else { return {}; }