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

Make specializations of detail array_deleter consistent.

Browse Source 
[SVN r81681]
This commit is contained in:
Glen Fernandes
2012-12-02 22:05:31 +00:00
parent 19283a3548
commit 500913db6d
3 changed files with 48 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -29,12 +29,12 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct(p2, n1); d2->construct(p2);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
@@ -47,12 +47,12 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct(p2, n1, boost::detail::sp_forward<Args>(args)...); d2->construct(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename A, typename... Args> template<typename T, typename A, typename... Args>
@@ -88,13 +88,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; std::size_t n1 = list.size() * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p3 = reinterpret_cast<T3*>(list.begin()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3); d2->construct_list(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif
@@ -136,13 +136,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = M * size; std::size_t n1 = M * size;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3, M); d2->construct_list(p2, p3, M);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename A> template<typename T, typename A>

51
include/boost/smart_ptr/detail/array_deleter.hpp
View File

@@ -19,42 +19,48 @@ namespace boost {
template<typename T> template<typename T>
class array_deleter<T[]> { class array_deleter<T[]> {
public: public:
array_deleter() array_deleter(std::size_t size)
: size(0) { : size(size),
object(0) {
} }
~array_deleter() { ~array_deleter() {
destroy(); destroy();
} }
void construct(T* memory, std::size_t count) { void construct(T* memory) {
for (object = memory; size < count; size++) { object = memory;
void* p1 = object + size; for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i;
::new(p1) T(); ::new(p1) T();
} }
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename... Args> template<typename... Args>
void construct(T* memory, std::size_t count, Args&&... args) { void construct(T* memory, Args&&... args) {
for (object = memory; size < count; size++) { object = memory;
void* p1 = object + size; for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i;
::new(p1) T(args...); ::new(p1) T(args...);
} }
} }
#endif #endif
void construct_list(T* memory, std::size_t count, const T* list) { void construct_list(T* memory, const T* list) {
for (object = memory; size < count; size++) { object = memory;
void* p1 = object + size; for (std::size_t i = 0; i < size; i++) {
::new(p1) T(list[size]); void* p1 = object + i;
::new(p1) T(list[i]);
} }
} }
void construct_list(T* memory, std::size_t count, const T* list, std::size_t n) { void construct_list(T* memory, const T* list, std::size_t n) {
for (object = memory; size < count; size++) { object = memory;
void* p1 = object + size; for (std::size_t i = 0; i < size; i++) {
::new(p1) T(list[size % n]); void* p1 = object + i;
::new(p1) T(list[i % n]);
} }
} }
void construct_noinit(T* memory, std::size_t count) { void construct_noinit(T* memory) {
for (object = memory; size < count; size++) { object = memory;
void* p1 = object + size; for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i;
::new(p1) T; ::new(p1) T;
} }
} }
@@ -63,8 +69,11 @@ namespace boost {
} }
private: private:
void destroy() { void destroy() {
while (size > 0) { if (object) {
object[--size].~T(); for (std::size_t i = size; i > 0; ) {
object[--i].~T();
}
object = 0;
} }
} }
std::size_t size; std::size_t size;

20
include/boost/smart_ptr/make_shared_array.hpp
View File

@@ -29,12 +29,12 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct(p2, n1); d2->construct(p2);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
@@ -47,12 +47,12 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct(p2, n1, boost::detail::sp_forward<Args>(args)...); d2->construct(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename... Args> template<typename T, typename... Args>
@@ -87,13 +87,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; std::size_t n1 = list.size() * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p3 = reinterpret_cast<T3*>(list.begin()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3); d2->construct_list(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#endif #endif
@@ -135,13 +135,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = M * size; std::size_t n1 = M * size;
boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3, M); d2->construct_list(p2, p3, M);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T> template<typename T>
@@ -177,12 +177,12 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2[]> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2[]> d1; boost::detail::array_deleter<T2[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1); boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[]>* d2; boost::detail::array_deleter<T2[]>* d2;
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_noinit(p2, n1); d2->construct_noinit(p2);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T> template<typename T>