From 32c83986e566f496ba9406ffad3ce9921cdbeccb Mon Sep 17 00:00:00 2001
From: Michele Caini <michele.caini@gmail.com>
Date: Thu, 13 May 2021 12:54:25 +0200
Subject: [PATCH] meta: minor changes

---
 src/entt/meta/container.hpp | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/entt/meta/container.hpp b/src/entt/meta/container.hpp
index 77d49ef01..2d7ff0d62 100644
--- a/src/entt/meta/container.hpp
+++ b/src/entt/meta/container.hpp
@@ -5,6 +5,7 @@
 #include <array>
 #include <map>
 #include <set>
+#include <type_traits>
 #include <unordered_map>
 #include <unordered_set>
 #include <vector>
@@ -133,8 +134,12 @@ struct basic_meta_associative_container_traits {
     }
 
     [[nodiscard]] static bool clear(any &container) {
-        auto * const cont = any_cast<Type>(&container);
-        return cont && (cont->clear(), true);
+        if(auto * const cont = any_cast<Type>(&container); cont) {
+            cont->clear();
+            return true;
+        }
+
+        return false;
     }
 
     [[nodiscard]] static iterator begin(any &container) {
@@ -158,8 +163,9 @@ struct basic_meta_associative_container_traits {
             if constexpr(is_key_only_meta_associative_container<Type>::value) {
                 return cont->insert(key.cast<const typename Type::key_type &>()).second;
             } else {
-                return value.allow_cast<const typename Type::mapped_type &>()
-                    && cont->emplace(key.cast<const typename Type::key_type &>(), value.cast<const typename Type::mapped_type &>()).second;
+                if(value.allow_cast<const typename Type::mapped_type &>()) {
+                    return cont->emplace(key.cast<const typename Type::key_type &>(), value.cast<const typename Type::mapped_type &>()).second;
+                }
             }
         }