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

Update make_shared for arrays to address 2070

Browse Source 
This updates make_shared and allocate_shared for arrays in accordance with
report 2070 which requires that allocator_traits<A2>::construct(a2, ptr,
...) is used for construction and allocator_traits<A2>::destroy(a2, ptr)
is used for destruction instead of placement new and destructor
invocation.
This commit is contained in:
Glen Fernandes
2014-02-04 00:29:51 -08:00
parent 2b033ce05d
commit 154a274916
10 changed files with 615 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/make_shared_array.hpp
+19 -20
View File
@@ -9,9 +9,8 @@
#ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
#define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
#include <boost/smart_ptr/detail/array_allocator.hpp>
#include <boost/smart_ptr/detail/array_deleter.hpp>
#include <boost/smart_ptr/detail/array_traits.hpp>
#include <boost/smart_ptr/detail/make_array_helper.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>
#include <boost/type_traits/remove_cv.hpp>
@@ -25,10 +24,10 @@ namespace boost {
T1* p1 = 0;
T3* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T3[]> a1(n1, &p2);
boost::detail::array_deleter<T3[]> d1(n1);
boost::detail::ms_allocator<T3[]> a1(n1, &p2);
boost::detail::ms_deleter<T3[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[]>* D2;
typedef boost::detail::ms_deleter<T3[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->init(p2);
@@ -46,10 +45,10 @@ namespace boost {
};
T1* p1 = 0;
T3* p2 = 0;
boost::detail::make_array_helper<T3[N]> a1(&p2);
boost::detail::array_deleter<T3[N]> d1;
boost::detail::ms_allocator<T3[N]> a1(&p2);
boost::detail::ms_deleter<T3[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[N]>* D2;
typedef boost::detail::ms_deleter<T3[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->init(p2);
@@ -71,10 +70,10 @@ namespace boost {
T3* p2 = 0;
T4* p3 = reinterpret_cast<T4*>(&value);
std::size_t n1 = M * size;
boost::detail::make_array_helper<T3[]> a1(n1, &p2);
boost::detail::array_deleter<T3[]> d1(n1);
boost::detail::ms_allocator<T3[]> a1(n1, &p2);
boost::detail::ms_deleter<T3[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[]>* D2;
typedef boost::detail::ms_deleter<T3[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->template init<M>(p2, p3);
@@ -95,10 +94,10 @@ namespace boost {
T1* p1 = 0;
T3* p2 = 0;
T4* p3 = reinterpret_cast<T4*>(&value);
boost::detail::make_array_helper<T3[N]> a1(&p2);
boost::detail::array_deleter<T3[N]> d1;
boost::detail::ms_allocator<T3[N]> a1(&p2);
boost::detail::ms_deleter<T3[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[N]>* D2;
typedef boost::detail::ms_deleter<T3[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->template init<M>(p2, p3);
@@ -114,10 +113,10 @@ namespace boost {
T1* p1 = 0;
T3* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T3[]> a1(n1, &p2);
boost::detail::array_deleter<T3[]> d1(n1);
boost::detail::ms_allocator<T3[]> a1(n1, &p2);
boost::detail::ms_deleter<T3[]> d1(n1);
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[]>* D2;
typedef boost::detail::ms_deleter<T3[]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->noinit(p2);
@@ -135,10 +134,10 @@ namespace boost {
};
T1* p1 = 0;
T3* p2 = 0;
boost::detail::make_array_helper<T3[N]> a1(&p2);
boost::detail::array_deleter<T3[N]> d1;
boost::detail::ms_allocator<T3[N]> a1(&p2);
boost::detail::ms_deleter<T3[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
typedef boost::detail::array_deleter<T3[N]>* D2;
typedef boost::detail::ms_deleter<T3[N]>* D2;
p1 = reinterpret_cast<T1*>(p2);
D2 d2 = static_cast<D2>(s1._internal_get_untyped_deleter());
d2->noinit(p2);