summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--compat/borrowed-ptr-cast.hpp42
-rw-r--r--compat/borrowed-ptr-fwd.hpp68
-rw-r--r--compat/borrowed-ptr.hpp85
-rw-r--r--test/bptr.cpp1
4 files changed, 103 insertions, 93 deletions
diff --git a/compat/borrowed-ptr-cast.hpp b/compat/borrowed-ptr-cast.hpp
new file mode 100644
index 00000000..b9db2e5b
--- /dev/null
+++ b/compat/borrowed-ptr-cast.hpp
@@ -0,0 +1,42 @@
+#pragma once
+#include "borrowed-ptr-fwd.hpp"
+#include "compat/assert.hpp"
+
+namespace floormat::detail_borrowed_ptr {
+
+//static_assert(std::is_same_v<T, U> || std::has_virtual_destructor_v<T> && std::has_virtual_destructor_v<T>); // todo! for simple_bptr
+
+template<typename From, typename To>
+concept StaticCastable = requires(From* from) {
+ static_cast<To*>(from);
+};
+
+} // namespace floormat::detail_borrowed_ptr
+
+namespace floormat {
+
+template<typename To, typename From>
+bptr<To> static_pointer_cast(const bptr<From>& p) noexcept
+{
+ // hack to generate better error message
+ if constexpr (detail_borrowed_ptr::StaticCastable<From, To>)
+ {
+ if (p.blk && p.blk->_ptr) [[likely]]
+ {
+ fm_assert(p.casted_ptr);
+ auto* ret = static_cast<To*>(p.casted_ptr);
+ return bptr<To>{DirectInit, ret, p.blk};
+ }
+ }
+ else
+ {
+ using detail_borrowed_ptr::StaticCastable;
+ // concepts can't be forward-declared so use static_assert
+ static_assert(StaticCastable<From, To>,
+ "cannot static_cast, classes must be related by inheritance");
+ }
+
+ return bptr<To>{nullptr};
+}
+
+} // namespace floormat
diff --git a/compat/borrowed-ptr-fwd.hpp b/compat/borrowed-ptr-fwd.hpp
index 8f4fafbe..3bb509d9 100644
--- a/compat/borrowed-ptr-fwd.hpp
+++ b/compat/borrowed-ptr-fwd.hpp
@@ -1,74 +1,10 @@
#pragma once
-
-namespace floormat::detail_borrowed_ptr {
-
-struct control_block;
-template<typename From, typename To>
-concept DerivedFrom = requires(From* x) {
- requires !std::is_same_v<From, To>;
- requires std::is_nothrow_convertible_v<From*, To*>;
-};
-
-} // namespace floormat::detail_borrowed_ptr
-
namespace floormat {
template<typename T> class bptr;
-template<typename T> bool operator==(const bptr<T>& a, const bptr<T>& b) noexcept;
-
-template<typename T>
-class bptr final // NOLINT(*-special-member-functions)
-{
- mutable T* casted_ptr;
- detail_borrowed_ptr::control_block* blk;
-
- explicit bptr(DirectInitT, T* casted_ptr, detail_borrowed_ptr::control_block* blk) noexcept;
-
- struct private_tag_t final {};
- static constexpr private_tag_t private_tag{};
-
- template<typename Y> bptr(const bptr<Y>& other, private_tag_t) noexcept;
- template<typename Y> bptr& _copy_assign(const bptr<Y>& other) noexcept;
- template<typename Y> bptr(bptr<Y>&& other, private_tag_t) noexcept;
- template<typename Y> bptr& _move_assign(bptr<Y>&& other) noexcept;
-public:
- template<typename... Ts>
- requires std::is_constructible_v<T, Ts&&...>
- explicit bptr(InPlaceInitT, Ts&&... args) noexcept;
-
- explicit bptr(T* ptr) noexcept;
- bptr() noexcept;
- ~bptr() noexcept;
-
- bptr(std::nullptr_t) noexcept; // NOLINT(*-explicit-conversions)
- bptr& operator=(std::nullptr_t) noexcept;
-
- bptr(const bptr&) noexcept;
- bptr& operator=(const bptr&) noexcept;
- template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr(const bptr<Y>&) noexcept;
- template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr& operator=(const bptr<Y>&) noexcept;
-
- bptr(bptr&&) noexcept;
- bptr& operator=(bptr&&) noexcept;
- template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr(bptr<Y>&&) noexcept;
- template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr& operator=(bptr<Y>&&) noexcept;
-
- void reset() noexcept;
- template<bool MaybeEmpty = true> void destroy() noexcept;
- void swap(bptr& other) noexcept;
- uint32_t use_count() const noexcept;
-
- T* get() const noexcept;
- T* operator->() const noexcept;
- T& operator*() const noexcept;
-
- explicit operator bool() const noexcept;
- friend bool operator==<T>(const bptr<T>& a, const bptr<T>& b) noexcept;
-
- template<typename U> friend class bptr;
- template<typename U, typename Tʹ> friend bptr<U> static_pointer_cast(const bptr<Tʹ>& p) noexcept;
-};
+template<typename T> bool operator==(const bptr<T>& a, const bptr<T>& b) noexcept;
+template<typename To, typename From> bptr<To> static_pointer_cast(const bptr<From>& p) noexcept;
template<typename T> bptr(T* ptr) -> bptr<T>;
diff --git a/compat/borrowed-ptr.hpp b/compat/borrowed-ptr.hpp
index b9db2e5b..e622f6d8 100644
--- a/compat/borrowed-ptr.hpp
+++ b/compat/borrowed-ptr.hpp
@@ -1,42 +1,73 @@
#pragma once
#include "borrowed-ptr-fwd.hpp"
-#include "compat/assert.hpp"
namespace floormat::detail_borrowed_ptr {
-//static_assert(std::is_same_v<T, U> || std::has_virtual_destructor_v<T> && std::has_virtual_destructor_v<T>); // todo! for simple_bptr
-
+struct control_block;
template<typename From, typename To>
-concept StaticCastable = requires(From* from) {
- static_cast<To*>(from);
+concept DerivedFrom = requires(From* x) {
+ requires !std::is_same_v<From, To>;
+ requires std::is_nothrow_convertible_v<From*, To*>;
};
} // namespace floormat::detail_borrowed_ptr
namespace floormat {
-template<typename To, typename From>
-bptr<To> static_pointer_cast(const bptr<From>& p) noexcept
+template<typename T> class bptr;
+
+template<typename T>
+class bptr final // NOLINT(*-special-member-functions)
{
- // hack to generate better error message
- if constexpr (detail_borrowed_ptr::StaticCastable<From, To>)
- {
- if (p.blk && p.blk->_ptr) [[likely]]
- {
- fm_assert(p.casted_ptr);
- auto* ret = static_cast<To*>(p.casted_ptr);
- return bptr<To>{DirectInit, ret, p.blk};
- }
- }
- else
- {
- using detail_borrowed_ptr::StaticCastable;
- // concepts can't be forward-declared so use static_assert
- static_assert(StaticCastable<From, To>,
- "cannot static_cast, classes must be related by inheritance");
- }
-
- return bptr<To>{nullptr};
-}
+ mutable T* casted_ptr;
+ detail_borrowed_ptr::control_block* blk;
+
+ explicit bptr(DirectInitT, T* casted_ptr, detail_borrowed_ptr::control_block* blk) noexcept;
+
+ struct private_tag_t final {};
+ static constexpr private_tag_t private_tag{};
+
+ template<typename Y> bptr(const bptr<Y>& other, private_tag_t) noexcept;
+ template<typename Y> bptr& _copy_assign(const bptr<Y>& other) noexcept;
+ template<typename Y> bptr(bptr<Y>&& other, private_tag_t) noexcept;
+ template<typename Y> bptr& _move_assign(bptr<Y>&& other) noexcept;
+
+public:
+ template<typename... Ts>
+ requires std::is_constructible_v<T, Ts&&...>
+ explicit bptr(InPlaceInitT, Ts&&... args) noexcept;
+
+ explicit bptr(T* ptr) noexcept;
+ bptr() noexcept;
+ ~bptr() noexcept;
+
+ bptr(std::nullptr_t) noexcept; // NOLINT(*-explicit-conversions)
+ bptr& operator=(std::nullptr_t) noexcept;
+
+ bptr(const bptr&) noexcept;
+ bptr& operator=(const bptr&) noexcept;
+ template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr(const bptr<Y>&) noexcept;
+ template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr& operator=(const bptr<Y>&) noexcept;
+
+ bptr(bptr&&) noexcept;
+ bptr& operator=(bptr&&) noexcept;
+ template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr(bptr<Y>&&) noexcept;
+ template<detail_borrowed_ptr::DerivedFrom<T> Y> bptr& operator=(bptr<Y>&&) noexcept;
+
+ void reset() noexcept;
+ template<bool MaybeEmpty = true> void destroy() noexcept;
+ void swap(bptr& other) noexcept;
+ uint32_t use_count() const noexcept;
+
+ T* get() const noexcept;
+ T* operator->() const noexcept;
+ T& operator*() const noexcept;
+
+ explicit operator bool() const noexcept;
+ friend bool operator==<T>(const bptr<T>& a, const bptr<T>& b) noexcept;
+
+ template<typename U> friend class bptr;
+ template<typename U, typename Tʹ> friend bptr<U> static_pointer_cast(const bptr<Tʹ>& p) noexcept;
+};
} // namespace floormat
diff --git a/test/bptr.cpp b/test/bptr.cpp
index e4672d66..b254f295 100644
--- a/test/bptr.cpp
+++ b/test/bptr.cpp
@@ -1,5 +1,6 @@
#include "app.hpp"
#include "compat/borrowed-ptr.inl"
+#include "compat/borrowed-ptr-cast.hpp"
#include "compat/assert.hpp"
#include "compat/defs.hpp"
#include <array>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-01 14:11:35 +0000