Commit b3b8fc9b authored by Dominik Charousset's avatar Dominik Charousset

Merge branch 'topic/nullptr-conversion'

parents ba12dd6c b55986ff
......@@ -78,6 +78,10 @@ public:
intrusive_cow_ptr(const intrusive_cow_ptr&) noexcept = default;
intrusive_cow_ptr(std::nullptr_t) noexcept {
// nop
}
template <class Y>
intrusive_cow_ptr(intrusive_cow_ptr<Y> other) noexcept
: ptr_(other.detach(), false) {
......
......@@ -64,6 +64,10 @@ public:
// nop
}
constexpr intrusive_ptr(std::nullptr_t) noexcept : intrusive_ptr() {
// nop
}
intrusive_ptr(pointer raw_ptr, bool add_ref = true) noexcept {
set_ptr(raw_ptr, add_ref);
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment