From adcf929fdf2e012e97b2a9b5d02ad66d49d6343b Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Mon, 9 Dec 2024 17:13:43 +0100
Subject: [PATCH] any: cleanup further

---
 TODO                  | 1 +
 src/entt/core/any.hpp | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 250de552e..4476c21d6 100644
--- a/TODO
+++ b/TODO
@@ -44,4 +44,5 @@ TODO:
 * built-in no-pagination storage - no_pagination page size as limits::max
 * meta_any ownership construction and from_void
 * sparse_set shrink_to_fit argument for sparse array shrink policy (none, empty, deep, whatever)
+* any cdynamic to support const ownership construction
 * track meta context on meta elements
diff --git a/src/entt/core/any.hpp b/src/entt/core/any.hpp
index a26f7d29d..2c1923160 100644
--- a/src/entt/core/any.hpp
+++ b/src/entt/core/any.hpp
@@ -109,9 +109,9 @@ class basic_any {
 
     template<typename Type, typename... Args>
     void initialize([[maybe_unused]] Args &&...args) {
-        using plain_type = std::remove_cv_t<std::remove_reference_t<Type>>;
-
         if constexpr(!std::is_void_v<Type>) {
+            using plain_type = std::remove_cv_t<std::remove_reference_t<Type>>;
+
             info = &type_id<plain_type>();
             vtable = basic_vtable<plain_type>;
 
@@ -178,10 +178,10 @@ public:
      */
     template<typename Type>
     explicit basic_any(std::in_place_t, Type *value)
-        : instance{value} {
+        : instance{} {
         static_assert(!std::is_const_v<Type> && !std::is_void_v<Type>, "Non-const non-void pointer required");
 
-        if(instance != nullptr) {
+        if(value != nullptr) {
             initialize<Type &>(*value);
             mode = any_policy::dynamic;
         }