boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-11-11 21:19:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

More consistency in type parameters in helper details of allocate_shared and make_shared.

Browse Source 
[SVN r81610]
This commit is contained in:
Glen Fernandes
2012-11-28 07:32:30 +00:00
parent fceea2e584
commit 39ff002d2e
5 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,12 +28,12 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1;
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);
d2 = get_deleter<boost::detail::array_deleter<T2> >(s1);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct(p2, n1);
return boost::shared_ptr<T>(s1, p1);
}
@@ -46,12 +46,12 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1;
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);
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)...);
return boost::shared_ptr<T>(s1, p1);
}
@@ -85,13 +85,13 @@ namespace boost {
T2* p2 = 0;
T3* p3 = 0;
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::array_deleter<T2> d1;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1;
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());
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);
return boost::shared_ptr<T>(s1, p1);
}
@@ -129,13 +129,13 @@ namespace boost {
T3* p3 = 0;
enum { M = boost::detail::array_total<T1>::size };
std::size_t n1 = M * list.size();
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2[]> d1;
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());
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);
return boost::shared_ptr<T>(s1, p1);
}