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

Update allocate_shared and make_shared to treat multidimensional array as single dimension. Remove detail array_helper. Add detail array traits. Update tests.

Browse Source 
[SVN r81236]
This commit is contained in:
Glen Fernandes
2012-11-07 18:37:17 +00:00
parent 93b5cace12
commit 5d9312239c
6 changed files with 109 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,50 +11,62 @@
#include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/smart_ptr/detail/array_deleter.hpp>
#include <boost/smart_ptr/detail/array_traits.hpp>
#include <boost/smart_ptr/detail/make_array_helper.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>
#include <boost/type_traits/remove_cv.hpp>
namespace boost {
template<typename T>
inline typename detail::sp_if_array<T>::type
make_shared(std::size_t size) {
typedef typename remove_cv<typename shared_ptr<T>::element_type>::type T1;
typedef typename shared_ptr<T>::element_type T1;
typedef typename detail::array_type<T1>::type T2;
T1* p1 = 0;
detail::make_array_helper<T1> a1(size, &p1);
detail::array_deleter<T1> d1;
T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size;
detail::make_array_helper<T2> a1(n1, &p2);
detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T1>* d2;
d2 = get_deleter<detail::array_deleter<T1> >(s1);
d2->construct(p1, size);
detail::array_deleter<T2>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1);
return shared_ptr<T>(s1, p1);
}
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename T, typename... Args>
inline typename detail::sp_if_array<T>::type
make_shared(std::size_t size, Args&&... args) {
typedef typename remove_cv<typename shared_ptr<T>::element_type>::type T1;
typedef typename shared_ptr<T>::element_type T1;
typedef typename detail::array_type<T1>::type T2;
T1* p1 = 0;
detail::make_array_helper<T1> a1(size, &p1);
detail::array_deleter<T1> d1;
T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size;
detail::make_array_helper<T2> a1(n1, &p2);
detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T1>* d2;
d2 = get_deleter<detail::array_deleter<T1> >(s1);
d2->construct(p1, size, std::forward<Args>(args)...);
detail::array_deleter<T2>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct(p2, n1, std::forward<Args>(args)...);
return shared_ptr<T>(s1, p1);
}
#endif
template<typename T>
inline typename detail::sp_if_array<T>::type
make_shared_noinit(std::size_t size) {
typedef typename remove_cv<typename shared_ptr<T>::element_type>::type T1;
typedef typename shared_ptr<T>::element_type T1;
typedef typename detail::array_type<T1>::type T2;
T1* p1 = 0;
detail::make_array_helper<T1> a1(size, &p1);
detail::array_deleter<T1> d1;
T2* p2 = 0;
size_t n1 = size * detail::array_size<T1>::size;
detail::make_array_helper<T2> a1(n1, &p2);
detail::array_deleter<T2> d1;
shared_ptr<T> s1(p1, d1, a1);
detail::array_deleter<T1>* d2;
d2 = get_deleter<detail::array_deleter<T1> >(s1);
d2->construct_noinit(p1, size);
detail::array_deleter<T2>* d2;
p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<detail::array_deleter<T2> >(s1);
d2->construct_noinit(p2, n1);
return shared_ptr<T>(s1, p1);
}
}