summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2024-07-15 11:10:28 +0200
committerStanislaw Halik <sthalik@misaki.pl>2024-07-15 11:10:28 +0200
commite006e1487776c44d13c2828eae0573ed0aa86bd9 (patch)
tree0071a08f9f42cdac5f47fd5cfc9257de7a9dedcb
parent48ef8ef7c0c1f9976b201a363db72d027ff5ead7 (diff)
w
-rw-r--r--compat/borrowed-ptr.cpp18
-rw-r--r--compat/borrowed-ptr.inl2
2 files changed, 1 insertions, 19 deletions
diff --git a/compat/borrowed-ptr.cpp b/compat/borrowed-ptr.cpp
index ab96f94e..04919df0 100644
--- a/compat/borrowed-ptr.cpp
+++ b/compat/borrowed-ptr.cpp
@@ -3,16 +3,6 @@
namespace floormat::detail_bptr {
-#ifdef __clang__
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdelete-abstract-non-virtual-dtor"
-#elif defined __GNUG__
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdelete-non-virtual-dtor"
-#elif defined _MSC_VER
-#pragma warning(push)
-#pragma warning(disable : 5205)
-#endif
void control_block::decrement(control_block*& blk) noexcept
{
auto c = --blk->_count;
@@ -26,14 +16,6 @@ void control_block::decrement(control_block*& blk) noexcept
//blk = (control_block*)-1;
}
-#ifdef __clang__
-#pragma clang diagnostic pop
-#elif defined __GNUG__
-#pragma GCC diagnostic pop
-#elif defined _MSC_VER
-#pragma warning(pop)
-#endif
-
} // namespace floormat::detail_bptr
namespace floormat {
diff --git a/compat/borrowed-ptr.inl b/compat/borrowed-ptr.inl
index ccc6ced4..59b4e14a 100644
--- a/compat/borrowed-ptr.inl
+++ b/compat/borrowed-ptr.inl
@@ -22,7 +22,7 @@
namespace floormat::detail_bptr {
-struct control_block
+struct control_block final
{
bptr_base* _ptr;
uint32_t _count;