boost/smart_ptr
2
0
Fork 0
mirror of https://github.com/boostorg/smart_ptr.git synced 2026-02-10 11:42:30 +00:00
Code Issues Projects Releases Wiki Activity

Use const T (&)[N] for fixed size arrays instead of std::initializer<T> in overloads of make_shared and allocate_shared for arrays.

Browse Source 
[SVN r81641]
This commit is contained in:
Glen Fernandes
2012-12-01 04:36:41 +00:00
parent 39ff002d2e
commit 4da0e2b7fc
6 changed files with 78 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -60,9 +60,11 @@ namespace boost {
allocate_shared(const A& allocator, Args&&... args) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
enum {
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
enum { N = boost::detail::array_total<T>::size };
boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
@@ -97,21 +99,21 @@ namespace boost {
}
template<typename T, typename A>
inline typename boost::detail::sp_if_size_array<T>::type
allocate_shared(const A& allocator,
std::initializer_list<typename boost::detail::array_inner<T>::type> list) {
allocate_shared(const A& allocator, const T& list) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
BOOST_ASSERT(list.size() == boost::detail::array_size<T>::size);
enum {
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
enum { N = boost::detail::array_total<T>::size };
boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3);
@@ -124,10 +126,12 @@ namespace boost {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
enum {
M = boost::detail::array_total<T1>::size
};
T1* p1 = 0;
T2* p2 = 0;
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;
@@ -142,21 +146,22 @@ namespace boost {
template<typename T, typename A>
inline typename boost::detail::sp_if_size_array<T>::type
allocate_shared(const A& allocator,
std::initializer_list<typename boost::detail::arrays_inner<T>::type> list) {
const typename boost::detail::array_inner<T>::type& list) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
BOOST_ASSERT(list.size() == boost::detail::array_size<T1>::size);
enum {
M = boost::detail::array_total<T1>::size,
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
enum { M = boost::detail::array_total<T1>::size };
enum { N = boost::detail::array_total<T>::size };
T3* p3 = 0;
boost::detail::allocate_array_helper<A, T2[N]> a1(allocator, &p2);
boost::detail::array_deleter<T2[N]> d1;
boost::shared_ptr<T> s1(p1, d1, a1);
boost::detail::array_deleter<T2[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3, M);

13
include/boost/smart_ptr/detail/array_traits.hpp
View File

@@ -22,8 +22,7 @@ namespace boost {
typedef typename array_base<T>::type type;
};
template<typename T>
struct array_size {
};
struct array_size;
template<typename T, std::size_t N>
struct array_size<T[N]> {
enum {
@@ -43,8 +42,7 @@ namespace boost {
};
};
template<typename T>
struct array_inner {
};
struct array_inner;
template<typename T>
struct array_inner<T[]> {
typedef T type;
@@ -54,16 +52,11 @@ namespace boost {
typedef T type;
};
template<typename T>
struct arrays_inner {
};
struct arrays_inner;
template<typename T, std::size_t N>
struct arrays_inner<T[][N]> {
typedef T type;
};
template<typename T, std::size_t M, std::size_t N>
struct arrays_inner<T[M][N]> {
typedef T type;
};
}
}

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

@@ -60,9 +60,11 @@ namespace boost {
make_shared(Args&&... args) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
enum {
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
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);
@@ -93,23 +95,24 @@ namespace boost {
d2 = get_deleter<boost::detail::array_deleter<T2[]> >(s1);
d2->construct_list(p2, n1, p3);
return boost::shared_ptr<T>(s1, p1);
}
}
template<typename T>
inline typename boost::detail::sp_if_size_array<T>::type
make_shared(std::initializer_list<typename boost::detail::array_inner<T>::type> list) {
make_shared(const T& list) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
BOOST_ASSERT(list.size() == boost::detail::array_size<T>::size);
enum {
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
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[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3);
@@ -122,10 +125,12 @@ namespace boost {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
enum {
M = boost::detail::array_total<T1>::size
};
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
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;
@@ -139,21 +144,22 @@ namespace boost {
}
template<typename T>
inline typename boost::detail::sp_if_size_array<T>::type
make_shared(std::initializer_list<typename boost::detail::arrays_inner<T>::type> list) {
make_shared(const typename boost::detail::array_inner<T>::type& list) {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
typedef const T2 T3;
BOOST_ASSERT(list.size() == boost::detail::array_size<T1>::size);
enum {
M = boost::detail::array_total<T1>::size,
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
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[N]>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3, M);
@@ -182,9 +188,11 @@ namespace boost {
make_shared_noinit() {
typedef typename boost::detail::array_inner<T>::type T1;
typedef typename boost::detail::array_base<T1>::type T2;
enum {
N = boost::detail::array_total<T>::size
};
T1* p1 = 0;
T2* p2 = 0;
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);