diff options
| -rw-r--r-- | compat/borrowed-ptr.cpp | 18 | ||||
| -rw-r--r-- | compat/borrowed-ptr.inl | 2 |
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; |