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

Add additional overload for make_shared and allocate_shared for arrays for fixed size arrays and initializer lists.

Browse Source 
[SVN r81266]
This commit is contained in:
Glen Fernandes
2012-11-09 17:30:07 +00:00
parent fe06c120b9
commit 2731957b5b
8 changed files with 78 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,6 +90,26 @@ namespace boost {
d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1);
}
template<typename T, typename A>
inline typename detail::sp_if_size_array<T>::type
allocate_shared(const A& allocator, typename detail::array_list<T>::type list) {
typedef typename detail::array_inner<T>::type T1;
typedef typename detail::array_base<T1>::type T2;
typedef const T2 T3;
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
size_t n1 = detail::array_size<T>::size;
detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2);
detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T2>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1);
}
#endif
}

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

@ -56,6 +56,10 @@ namespace boost {
struct array_list<T[]> {
typedef std::initializer_list<T> type;
};
template<typename T, size_t N>
struct array_list<T[N]> {
typedef std::initializer_list<T> type;
};
#endif
}
}

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

@ -90,6 +90,26 @@ namespace boost {
d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1);
}
template<typename T>
inline typename detail::sp_if_size_array<T>::type
make_shared(typename detail::array_list<T>::type list) {
typedef typename detail::array_inner<T>::type T1;
typedef typename detail::array_base<T1>::type T2;
typedef const T2 T3;
T1* p1 = 0;
T2* p2 = 0;
T3* p3 = 0;
size_t n1 = detail::array_size<T>::size;
detail::make_array_helper<T2> a1(n1, &p2);
detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T2>* d2;
p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, p3);
return shared_ptr<T>(s1, p1);
}
#endif
template<typename T>
inline typename detail::sp_if_array<T>::type

6
make_shared_array.html
View File

@ -50,9 +50,15 @@
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
template&lt;typename T, typename... Args&gt;
shared_ptr&lt;T[]&gt; <a href="#functions">make_shared</a>(std::initializer_list&lt;T&gt; list);
template&lt;typename T, typename... Args&gt;
shared_ptr&lt;T[N]&gt; <a href="#functions">make_shared</a>(std::initializer_list&lt;T&gt; list);
template&lt;typename T, typename A, typename... Args&gt;
shared_ptr&lt;T[]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, std::initializer_list&lt;T&gt; list);
template&lt;typename T, typename A, typename... Args&gt;
shared_ptr&lt;T[N]&gt; <a href="#functions">allocate_shared</a>(const A&amp; allocator, std::initializer_list&lt;T&gt; list);
#endif
template&lt;typename T&gt;

7
test/allocate_shared_array_create_test.cpp
View File

@ -118,6 +118,13 @@ int main() {
BOOST_TEST(a1[2] == 2);
BOOST_TEST(a1[3] == 3);
}
{
boost::shared_ptr<int[4]> a1 = boost::allocate_shared<int[4]>(std::allocator<int>(), { 0, 1, 2, 3 });
BOOST_TEST(a1[0] == 0);
BOOST_TEST(a1[1] == 1);
BOOST_TEST(a1[2] == 2);
BOOST_TEST(a1[3] == 3);
}
#endif
return boost::report_errors();
}

7
test/allocate_shared_arrays_create_test.cpp
View File

@ -18,6 +18,13 @@ int main() {
BOOST_TEST(a1[1][0] == 2);
BOOST_TEST(a1[1][1] == 3);
}
{
boost::shared_ptr<int[2][2]> a1 = boost::allocate_shared<int[2][2]>(std::allocator<int>(), { {0, 1}, {2, 3} });
BOOST_TEST(a1[0][0] == 0);
BOOST_TEST(a1[0][1] == 1);
BOOST_TEST(a1[1][0] == 2);
BOOST_TEST(a1[1][1] == 3);
}
#endif
return boost::report_errors();
}

7
test/make_shared_array_create_test.cpp
View File

@ -118,6 +118,13 @@ int main() {
BOOST_TEST(a1[2] == 2);
BOOST_TEST(a1[3] == 3);
}
{
boost::shared_ptr<int[4]> a1 = boost::make_shared<int[4]>({ 0, 1, 2, 3 });
BOOST_TEST(a1[0] == 0);
BOOST_TEST(a1[1] == 1);
BOOST_TEST(a1[2] == 2);
BOOST_TEST(a1[3] == 3);
}
#endif
return boost::report_errors();
}

7
test/make_shared_arrays_create_test.cpp
View File

@ -18,6 +18,13 @@ int main() {
BOOST_TEST(a1[1][0] == 2);
BOOST_TEST(a1[1][1] == 3);
}
{
boost::shared_ptr<int[2][2]> a1 = boost::make_shared<int[2][2]>({ {0, 1}, {2, 3} });
BOOST_TEST(a1[0][0] == 0);
BOOST_TEST(a1[0][1] == 1);
BOOST_TEST(a1[1][0] == 2);
BOOST_TEST(a1[1][1] == 3);
}
#endif
return boost::report_errors();
}