boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-07-31 21:24:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/suggest-override

Browse Source
This commit is contained in:
Peter Dimov
2020-04-14 00:45:24 +03:00
parent 2320dafc03 2dd35e5fbc
commit 5be7523ebe
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
include/boost/smart_ptr/allocate_local_shared_array.hpp
View File

@@ -21,11 +21,12 @@ public:
count_ = shared_count(base); count_ = shared_count(base);
} }
virtual void local_cb_destroy() BOOST_SP_NOEXCEPT { void local_cb_destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
shared_count().swap(count_); shared_count().swap(count_);
} }
virtual shared_count local_cb_get_shared_count() const BOOST_SP_NOEXCEPT { shared_count local_cb_get_shared_count() const
BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
return count_; return count_;
} }

11
include/boost/smart_ptr/allocate_shared_array.hpp
View File

@@ -206,28 +206,29 @@ public:
return state_; return state_;
} }
virtual void dispose() BOOST_SP_NOEXCEPT { void dispose() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
boost::alloc_destroy_n(state_.allocator(), boost::alloc_destroy_n(state_.allocator(),
boost::first_scalar(sp_array_start<type>(this)), boost::first_scalar(sp_array_start<type>(this)),
state_.size() * sp_array_count<type>::value); state_.size() * sp_array_count<type>::value);
} }
virtual void destroy() BOOST_SP_NOEXCEPT { void destroy() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
sp_array_creator<allocator, sp_array_base> other(state_.allocator(), sp_array_creator<allocator, sp_array_base> other(state_.allocator(),
state_.size()); state_.size());
this->~sp_array_base(); this->~sp_array_base();
other.destroy(this); other.destroy(this);
} }
virtual void* get_deleter(const sp_typeinfo_&) BOOST_SP_NOEXCEPT { void* get_deleter(const sp_typeinfo_&) BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
return 0; return 0;
} }
virtual void* get_local_deleter(const sp_typeinfo_&) BOOST_SP_NOEXCEPT { void* get_local_deleter(const sp_typeinfo_&)
BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
return 0; return 0;
} }
virtual void* get_untyped_deleter() BOOST_SP_NOEXCEPT { void* get_untyped_deleter() BOOST_SP_NOEXCEPT BOOST_OVERRIDE {
return 0; return 0;
} }