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

Clean up code in allocate_shared_array.hpp and make_shared_array.hpp

Browse Source 
[SVN r81258]
This commit is contained in:
Glen Fernandes
2012-11-09 09:14:23 +00:00
parent 3d50db11b9
commit 730980f3ee
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,19 +58,19 @@ namespace boost {
allocate_shared(const A& allocator, size_t size, typename detail::array_list<T>::type list) { allocate_shared(const A& allocator, size_t size, typename detail::array_list<T>::type list) {
typedef typename shared_ptr<T>::element_type T1; typedef typename shared_ptr<T>::element_type T1;
typedef typename detail::array_type<T1>::type T2; typedef typename detail::array_type<T1>::type T2;
typedef const T1* L1; typedef const T2 T3;
typedef const T2* L2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
L1 l1 = list.begin(); T3* p3 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_size<T1>::size;
detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2); detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
detail::array_deleter<T2> d1; detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1); shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T2>* d2; detail::array_deleter<T2>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1); d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, L2(l1)); d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1); return shared_ptr<T>(s1, p1);
} }
#endif #endif

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

@@ -58,19 +58,19 @@ namespace boost {
make_shared(std::size_t size, typename detail::array_list<T>::type list) { make_shared(std::size_t size, typename detail::array_list<T>::type list) {
typedef typename shared_ptr<T>::element_type T1; typedef typename shared_ptr<T>::element_type T1;
typedef typename detail::array_type<T1>::type T2; typedef typename detail::array_type<T1>::type T2;
typedef const T1* L1; typedef const T2 T3;
typedef const T2* L2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
L1 l1 = list.begin(); T3* p3 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_size<T1>::size;
detail::make_array_helper<T2> a1(n1, &p2); detail::make_array_helper<T2> a1(n1, &p2);
detail::array_deleter<T2> d1; detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1); shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T2>* d2; detail::array_deleter<T2>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1); d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, L2(l1)); d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1); return shared_ptr<T>(s1, p1);
} }
#endif #endif