feedc0de/boost_smart_ptr
1
0 Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge branch 'develop' into feature/local_get_deleter

Browse Source
This commit is contained in:
Peter Dimov committed 2017-06-20 19:35:23 +03:00
2 parents 6e5a382b6b 028bb2cee8
commit 052ebd1946
5 files changed
+271 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

include/boost/smart_ptr/allocate_shared_array.hpp
+8 -8
View File
@@ -762,8 +762,8 @@ public:
allocator.deallocate(this, 1);
}
void* get_deleter(const sp_typeinfo&) {
return &reinterpret_cast<char&>(deleter_);
void* get_deleter(const sp_typeinfo& ti) {
return ti == BOOST_SP_TYPEID(deleter_type)? &reinterpret_cast<char&>(deleter_): 0;
}
void* get_untyped_deleter() {
@@ -803,8 +803,8 @@ public:
allocator.deallocate(this, 1);
}
void* get_deleter(const sp_typeinfo&) {
return &reinterpret_cast<char&>(deleter_);
void* get_deleter(const sp_typeinfo& ti) {
return ti == BOOST_SP_TYPEID(deleter_type)? &reinterpret_cast<char&>(deleter_): 0;
}
void* get_untyped_deleter() {
@@ -849,8 +849,8 @@ public:
allocator.deallocate(this, 1);
}
void* get_deleter(const sp_typeinfo&) {
return &reinterpret_cast<char&>(deleter_);
void* get_deleter(const sp_typeinfo& ti) {
return ti == BOOST_SP_TYPEID(deleter_type)? &reinterpret_cast<char&>(deleter_): 0;
}
void* get_untyped_deleter() {
@@ -894,8 +894,8 @@ public:
allocator.deallocate(this, 1);
}
void* get_deleter(const sp_typeinfo&) {
return &reinterpret_cast<char&>(deleter_);
void* get_deleter(const sp_typeinfo& ti) {
return ti == BOOST_SP_TYPEID(deleter_type)? &reinterpret_cast<char&>(deleter_): 0;
}
void* get_untyped_deleter() {