any: avoid else after return

skypjack · Oct 4, 2024 · cc79817 · cc79817
1 parent f39c687
commit cc79817
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/entt/core/any.hpp b/src/entt/core/any.hpp
@@ -341,9 +341,9 @@ class basic_any {
         if(vtable && mode != any_policy::cref && *info == *other.info) {
             if(auto *val = other.data(); val) {
                 return (vtable(operation::transfer, *this, val) != nullptr);
-            } else {
-                return (vtable(operation::assign, *this, std::as_const(other).data()) != nullptr);
             }
+
+            return (vtable(operation::assign, *this, std::as_const(other).data()) != nullptr);
         }
 
         return false;
@@ -453,9 +453,9 @@ template<typename Type, std::size_t Len, std::size_t Align>
     if constexpr(std::is_copy_constructible_v<std::remove_cv_t<std::remove_reference_t<Type>>>) {
         if(auto *const instance = any_cast<std::remove_reference_t<Type>>(&data); instance) {
             return static_cast<Type>(std::move(*instance));
-        } else {
-            return any_cast<Type>(data);
         }
+
+        return any_cast<Type>(data);
     } else {
         auto *const instance = any_cast<std::remove_reference_t<Type>>(&data);
         ENTT_ASSERT(instance, "Invalid instance");