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

More consistency in type parameters in helper details of allocate_shared and make_shared.

Browse Source 
[SVN r81610]
This commit is contained in:
Glen Fernandes
2012-11-28 07:32:30 +00:00
parent fceea2e584
commit 39ff002d2e
5 changed files with 55 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -28,12 +28,12 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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); 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); d2->construct(p2, n1);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -46,12 +46,12 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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); 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)...); d2->construct(p2, n1, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -85,13 +85,13 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; std::size_t n1 = list.size() * boost::detail::array_total<T1>::size;
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); 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); d2->construct_list(p2, n1, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -129,13 +129,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
enum { M = boost::detail::array_total<T1>::size }; enum { M = boost::detail::array_total<T1>::size };
std::size_t n1 = M * list.size(); std::size_t n1 = M * list.size();
boost::detail::allocate_array_helper<A, T2> a1(allocator, n1, &p2); boost::detail::allocate_array_helper<A, T2[]> a1(allocator, n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); 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, M); d2->construct_list(p2, n1, p3, M);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }

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

@ -13,8 +13,10 @@
namespace boost { namespace boost {
namespace detail { namespace detail {
template<typename A, typename T, typename Y = T> template<typename A, typename T, typename Y = char>
class allocate_array_helper { class allocate_array_helper;
template<typename A, typename T, typename Y>
class allocate_array_helper<A, T[], Y> {
template<typename A9, typename T9, typename Y9> template<typename A9, typename T9, typename Y9>
friend class allocate_array_helper; friend class allocate_array_helper;
typedef typename A::template rebind<Y> ::other A2; typedef typename A::template rebind<Y> ::other A2;
@ -29,7 +31,7 @@ namespace boost {
typedef typename A2::difference_type difference_type; typedef typename A2::difference_type difference_type;
template<typename U> template<typename U>
struct rebind { struct rebind {
typedef allocate_array_helper<A, T, U> other; typedef allocate_array_helper<A, T[], U> other;
}; };
allocate_array_helper(const A& allocator, std::size_t size, T** data) allocate_array_helper(const A& allocator, std::size_t size, T** data)
: allocator(allocator), : allocator(allocator),
@ -37,7 +39,7 @@ namespace boost {
data(data) { data(data) {
} }
template<class U> template<class U>
allocate_array_helper(const allocate_array_helper<A, T, U>& other) allocate_array_helper(const allocate_array_helper<A, T[], U>& other)
: allocator(other.allocator), : allocator(other.allocator),
size(other.size), size(other.size),
data(other.data) { data(other.data) {
@ -75,11 +77,11 @@ namespace boost {
allocator.destroy(memory); allocator.destroy(memory);
} }
template<typename U> template<typename U>
bool operator==(const allocate_array_helper<A, T, U>& other) const { bool operator==(const allocate_array_helper<A, T[], U>& other) const {
return allocator == other.allocator; return allocator == other.allocator;
} }
template<typename U> template<typename U>
bool operator!=(const allocate_array_helper<A, T, U>& other) const { bool operator!=(const allocate_array_helper<A, T[], U>& other) const {
return !(*this == other); return !(*this == other);
} }
private: private:

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

@ -15,7 +15,9 @@
namespace boost { namespace boost {
namespace detail { namespace detail {
template<typename T> template<typename T>
class array_deleter { class array_deleter;
template<typename T>
class array_deleter<T[]> {
public: public:
array_deleter() array_deleter()
: size(0) { : size(0) {

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

@ -13,8 +13,10 @@
namespace boost { namespace boost {
namespace detail { namespace detail {
template<typename T, typename Y = T> template<typename T, typename Y = char>
class make_array_helper { class make_array_helper;
template<typename T, typename Y>
class make_array_helper<T[], Y> {
template<typename T2, typename Y2> template<typename T2, typename Y2>
friend class make_array_helper; friend class make_array_helper;
public: public:
@ -27,14 +29,14 @@ namespace boost {
typedef ptrdiff_t difference_type; typedef ptrdiff_t difference_type;
template<typename U> template<typename U>
struct rebind { struct rebind {
typedef make_array_helper<T, U> other; typedef make_array_helper<T[], U> other;
}; };
make_array_helper(std::size_t size, T** data) make_array_helper(std::size_t size, T** data)
: size(sizeof(T) * size), : size(sizeof(T) * size),
data(data) { data(data) {
} }
template<class U> template<class U>
make_array_helper(const make_array_helper<T, U>& other) make_array_helper(const make_array_helper<T[], U>& other)
: size(other.size), : size(other.size),
data(other.data) { data(other.data) {
} }
@ -70,11 +72,11 @@ namespace boost {
memory->~Y(); memory->~Y();
} }
template<typename U> template<typename U>
bool operator==(const make_array_helper<T, U>& other) const { bool operator==(const make_array_helper<T[], U>& other) const {
return true; return true;
} }
template<typename U> template<typename U>
bool operator!=(const make_array_helper<T, U>& other) const { bool operator!=(const make_array_helper<T[], U>& other) const {
return !(*this == other); return !(*this == other);
} }
private: private:

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

@ -28,12 +28,12 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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); 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); d2->construct(p2, n1);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -46,12 +46,12 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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); 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)...); d2->construct(p2, n1, boost::detail::sp_forward<Args>(args)...);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -84,13 +84,13 @@ namespace boost {
T2* p2 = 0; T2* p2 = 0;
T3* p3 = 0; T3* p3 = 0;
std::size_t n1 = list.size() * boost::detail::array_total<T1>::size; std::size_t n1 = list.size() * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); 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); d2->construct_list(p2, n1, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -127,13 +127,13 @@ namespace boost {
T3* p3 = 0; T3* p3 = 0;
enum { M = boost::detail::array_total<T1>::size }; enum { M = boost::detail::array_total<T1>::size };
std::size_t n1 = M * size; std::size_t n1 = M * size;
boost::detail::make_array_helper<T2> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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()); p3 = reinterpret_cast<T3*>(list.begin());
p1 = reinterpret_cast<T1*>(p2); 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, M); d2->construct_list(p2, n1, p3, M);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
@ -168,12 +168,12 @@ namespace boost {
T1* p1 = 0; T1* p1 = 0;
T2* p2 = 0; T2* p2 = 0;
std::size_t n1 = size * boost::detail::array_total<T1>::size; std::size_t n1 = size * boost::detail::array_total<T1>::size;
boost::detail::make_array_helper<T2> a1(n1, &p2); boost::detail::make_array_helper<T2[]> a1(n1, &p2);
boost::detail::array_deleter<T2> d1; boost::detail::array_deleter<T2[]> d1;
boost::shared_ptr<T> s1(p1, d1, a1); 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); 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); d2->construct_noinit(p2, n1);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }