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

Add assertion to overload of make_shared and allocate_shared for T[N] with initializer lists. Rename detail type to be more intuitive.

Browse Source 
[SVN r81267]
This commit is contained in:
Glen Fernandes
2012-11-09 18:01:39 +00:00
parent 2731957b5b
commit 8cc50a5ce9
4 changed files with 26 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_total<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);
@ -41,7 +41,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_total<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);
@ -58,7 +58,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = detail::array_size<T>::size; size_t n1 = detail::array_total<T>::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);
@ -79,7 +79,7 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
size_t n1 = list.size() * detail::array_size<T1>::size; size_t n1 = list.size() * detail::array_total<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);
@ -93,13 +93,14 @@ namespace boost {
template<typename T, typename A> template<typename T, typename A>
inline typename detail::sp_if_size_array<T>::type inline typename detail::sp_if_size_array<T>::type
allocate_shared(const A& allocator, typename detail::array_list<T>::type list) { allocate_shared(const A& allocator, typename detail::array_list<T>::type list) {
BOOST_ASSERT(list.size() == detail::array_size<T>::size);
typedef typename detail::array_inner<T>::type T1; typedef typename detail::array_inner<T>::type T1;
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
typedef const T2 T3; typedef const T2 T3;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
size_t n1 = detail::array_size<T>::size; size_t n1 = detail::array_total<T>::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);

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

@ -13,7 +13,6 @@
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST) #if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
#include <initializer_list> #include <initializer_list>
#endif #endif
#include <cstddef>
namespace boost { namespace boost {
namespace detail { namespace detail {
@ -27,14 +26,23 @@ namespace boost {
}; };
template<typename T> template<typename T>
struct array_size { struct array_size {
};
template<typename T, size_t N>
struct array_size<T[N]> {
enum {
size = N
};
};
template<typename T>
struct array_total {
enum { enum {
size = 1 size = 1
}; };
}; };
template<typename T, std::size_t N> template<typename T, std::size_t N>
struct array_size<T[N]> { struct array_total<T[N]> {
enum { enum {
size = N * array_size<T>::size size = N * array_total<T>::size
}; };
}; };
template<typename T> template<typename T>

2
include/boost/smart_ptr/detail/sp_if_array.hpp
View File

@ -23,7 +23,7 @@ namespace boost {
template<typename T> template<typename T>
struct sp_if_size_array { struct sp_if_size_array {
}; };
template<typename T, size_t N> template<typename T, std::size_t N>
struct sp_if_size_array<T[N]> { struct sp_if_size_array<T[N]> {
typedef boost::shared_ptr<T[N]> type; typedef boost::shared_ptr<T[N]> type;
}; };

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

@ -23,7 +23,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_total<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);
@ -41,7 +41,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_total<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);
@ -58,7 +58,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = detail::array_size<T>::size; size_t n1 = detail::array_total<T>::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);
@ -79,7 +79,7 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
size_t n1 = list.size() * detail::array_size<T1>::size; size_t n1 = list.size() * detail::array_total<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);
@ -93,13 +93,14 @@ namespace boost {
template<typename T> template<typename T>
inline typename detail::sp_if_size_array<T>::type inline typename detail::sp_if_size_array<T>::type
make_shared(typename detail::array_list<T>::type list) { make_shared(typename detail::array_list<T>::type list) {
BOOST_ASSERT(list.size() == detail::array_size<T>::size);
typedef typename detail::array_inner<T>::type T1; typedef typename detail::array_inner<T>::type T1;
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
typedef const T2 T3; typedef const T2 T3;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
size_t n1 = detail::array_size<T>::size; size_t n1 = detail::array_total<T>::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);
@ -118,7 +119,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size; size_t n1 = size * detail::array_total<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);
@ -135,7 +136,7 @@ namespace boost {
typedef typename detail::array_base<T1>::type T2; typedef typename detail::array_base<T1>::type T2;
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
size_t n1 = detail::array_size<T>::size; size_t n1 = detail::array_total<T>::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);