fix msvc compilation

HUD-Software · Jan 14, 2025 · 60de51e · 60de51e
1 parent 51d761b
commit 60de51e
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/interface/core/containers/hashset.h b/interface/core/containers/hashset.h
@@ -626,7 +626,7 @@ namespace hud
                             group_type group {ctrl};
                             for (u32 full_index : group.mask_of_full_slot())
                             {
-                                hud::memory::destroy(slot_ptr_[full_index]);
+                                hud::memory::destroy(slot_ptr_ + full_index);
                                 --remaining_slots;
                             }
                             ctrl += group_type::SLOT_PER_GROUP;

diff --git a/interface/core/containers/optional.h b/interface/core/containers/optional.h
@@ -60,7 +60,7 @@ namespace hud
             {
                 if (this_as_base_t()->some)
                 {
-                    hud::memory::destroy(this_as_base_t()->some_value);
+                    hud::memory::destroy(&this_as_base_t()->some_value);
                     this_as_base_t()->some = false;
                 }
             }
@@ -224,7 +224,7 @@ namespace hud
             {
                 if (some)
                 {
-                    hud::memory::destroy(some_value);
+                    hud::memory::destroy(&some_value);
                 }
             }
 

diff --git a/interface/core/containers/shared_pointer.h b/interface/core/containers/shared_pointer.h
@@ -326,7 +326,7 @@ namespace hud
             /** Destroy the object by calling the destructor. */
             constexpr void destroy_object() noexcept final
             {
-                hud::memory::destroy(*pointer());
+                hud::memory::destroy(pointer());
             }
 
         private:

diff --git a/interface/core/memory/memory.h b/interface/core/memory/memory.h
@@ -925,12 +925,12 @@ namespace hud
         */
         template<typename type_t>
         requires(is_destructible_v<type_t> && !hud::is_pointer_v<type_t>)
-        static constexpr void destroy(type_t &obj) noexcept
+        static constexpr void destroy(type_t *obj) noexcept
         {
             if constexpr (!hud::is_trivially_destructible_v<type_t>)
             {
                 static_assert(hud::is_nothrow_destructible_v<type_t>, "type_t destructor is throwable.hud::memory::destroy is not designed to allow throwable destructible type");
-                obj.~type_t();
+                obj->~type_t();
             }
         }
 
@@ -949,7 +949,7 @@ namespace hud
             {
                 while (count)
                 {
-                    hud::memory::destroy<type_t>(*address);
+                    hud::memory::destroy<type_t>(address);
                     address++;
                     count--;
                 }
@@ -1128,7 +1128,7 @@ namespace hud
         static constexpr void move_or_copy_construct_then_destroy(type_t *destination, u_type_t &&source) noexcept
         {
             hud::memory::construct_at<type_t, u_type_t>(destination, hud::forward<u_type_t>(source));
-            hud::memory::destroy<u_type_t>(source);
+            hud::memory::destroy<u_type_t>(&source);
         }
 
         /**

diff --git a/test/memory/memory_destroy.cpp b/test/memory/memory_destroy.cpp
@@ -12,7 +12,7 @@ GTEST_TEST(memory, destroy_trivial_type)
     auto test = []() -> ResultType
     {
         type to_destroy = 15;
-        hud::memory::destroy(to_destroy);
+        hud::memory::destroy(&to_destroy);
         return to_destroy;
     };
 
@@ -46,7 +46,7 @@ GTEST_TEST(memory, destroy_trivially_destructible_type)
     {
         type to_destroy;
         to_destroy.i = 15;
-        hud::memory::destroy(to_destroy);
+        hud::memory::destroy(&to_destroy);
         return to_destroy.i;
     };
 
@@ -77,7 +77,7 @@ GTEST_TEST(memory, destroy_non_trivially_destructible_type)
         type *to_destroy = hud::memory::allocate_array<type>(1);
         hud_test::LeakArrayGuard guard(to_destroy, 1);
         hud::memory::construct_at(to_destroy, &is_destructor_called);
-        hud::memory::destroy(*to_destroy);
+        hud::memory::destroy(to_destroy);
         return is_destructor_called;
     };