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

Merged revision(s) 81608-81610 from trunk:

Browse Source 
Optimization: Add specializations of make_array_helper, allocate_array_helper, and array_deleter for fixed size arrays to avoid storing size.
........
Consistent formatting across overloads of make_shared and allocate_shared (array forms).
........
More consistency in type parameters in helper details of allocate_shared and make_shared.
........


[SVN r81635]
This commit is contained in:
Glen Fernandes
2012-11-30 17:29:36 +00:00
parent c7b6e56b30
commit 2346941b15
5 changed files with 311 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/make_shared_array.hpp
+49 -49
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::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::make_array_helper<T2[]> a1(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::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::make_array_helper<T2[]> a1(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);
}
@@ -62,14 +62,14 @@ namespace boost {
typedef typename boost::detail::array_base<T1>::type T2;
T1* p1 = 0;
T2* p2 = 0;
std::size_t n1 = boost::detail::array_total<T>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
enum { N = boost::detail::array_total<T>::size };
boost::detail::make_array_helper<T2[N]> a1(&p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2>* d2;
boost::detail::array_deleter<T2[N]>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, boost::detail::sp_forward<Args>(args)...);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct(p2, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1);
}
#endif
@@ -84,13 +84,13 @@ namespace boost {
T2* p2 = 0;
T3* p3 = 0;
std::size_t n1 = list.size() * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::make_array_helper<T2[]> a1(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);
}
@@ -104,15 +104,15 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
std::size_t n1 = boost::detail::array_total<T>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
enum { N = boost::detail::array_total<T>::size };
boost::detail::make_array_helper<T2[N]> a1(&p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2>* d2;
boost::detail::array_deleter<T2[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2> >(s1);
d2->construct_list(p2, n1, p3);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3);
return boost::shared_ptr<T>(s1, p1);
}
template<typename T>
@@ -125,16 +125,16 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
std::size_t n0 = boost::detail::array_total<T1>::size;
std::size_t n1 = n0 * size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
enum { M = boost::detail::array_total<T1>::size };
std::size_t n1 = M * size;
boost::detail::make_array_helper<T2[]> a1(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->construct_list(p2, n1, p3, n0);
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3, M);
return boost::shared_ptr<T>(s1, p1);
}
template<typename T>
@@ -147,16 +147,16 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
std::size_t n0 = boost::detail::array_total<T1>::size;
std::size_t n1 = boost::detail::array_total<T>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
enum { M = boost::detail::array_total<T1>::size };
enum { N = boost::detail::array_total<T>::size };
boost::detail::make_array_helper<T2[N]> a1(&p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2>* d2;
boost::detail::array_deleter<T2[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2> >(s1);
d2->construct_list(p2, n1, p3, n0);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3, M);
return boost::shared_ptr<T>(s1, p1);
}
#endif
@@ -168,12 +168,12 @@ namespace boost {
T1* p1 = 0;
T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
boost::detail::make_array_helper<T2[]> a1(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_noinit(p2, n1);
return boost::shared_ptr<T>(s1, p1);
}
@@ -184,14 +184,14 @@ namespace boost {
typedef typename boost::detail::array_base<T1>::type T2;
T1* p1 = 0;
T2* p2 = 0;
std::size_t n1 = boost::detail::array_total<T>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2);
boost::detail::array_deleter<T2> d1;
enum { N = boost::detail::array_total<T>::size };
boost::detail::make_array_helper<T2[N]> a1(&p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2> >(s1);
d2->construct_noinit(p2, n1);
boost::detail::array_deleter<T2[N]>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_noinit(p2);
return boost::shared_ptr<T>(s1, p1);
}
}