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

Convert function parameter for inner array size into template parameter and make identifiers in array_deleter consistent with those in array_utility

Browse Source 
[SVN r81782]
This commit is contained in:
Glen Fernandes
2012-12-08 05:25:50 +00:00
parent 8093967da7
commit 6b0d96af96
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -141,7 +141,7 @@ namespace boost {
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
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, p3, M); d2->construct_list<M>(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T, typename A> template<typename T, typename A>
@@ -165,7 +165,7 @@ namespace boost {
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3, M); d2->construct_list<M>(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#if defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_RVALUE_REFS)

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

@@ -34,13 +34,13 @@ namespace boost {
} }
#if defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) { void construct(T* memory, T&& value) {
array_construct_value(memory, size, sp_forward<T>(value)); array_construct(memory, size, sp_forward<T>(value));
object = memory; object = memory;
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) #if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename... Args> template<typename... Args>
void construct(T* memory, Args&&... args) { void construct(T* memory, Args&&... args) {
array_construct_args(memory, size, sp_forward<Args>(args)...); array_construct(memory, size, sp_forward<Args>(args)...);
object = memory; object = memory;
} }
#endif #endif
@@ -49,8 +49,9 @@ namespace boost {
array_construct_list(memory, size, list); array_construct_list(memory, size, list);
object = memory; object = memory;
} }
void construct_list(T* memory, const T* list, std::size_t n) { template<std::size_t M>
array_construct_list(memory, size, list, n); void construct_list(T* memory, const T* list) {
array_construct_list<T, M>(memory, size, list);
object = memory; object = memory;
} }
void construct_noinit(T* memory) { void construct_noinit(T* memory) {
@@ -84,13 +85,13 @@ namespace boost {
} }
#if defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) { void construct(T* memory, T&& value) {
array_construct_value(memory, N, sp_forward<T>(value)); array_construct(memory, N, sp_forward<T>(value));
object = memory; object = memory;
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) #if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename... Args> template<typename... Args>
void construct(T* memory, Args&&... args) { void construct(T* memory, Args&&... args) {
array_construct_args(memory, N, sp_forward<Args>(args)...); array_construct(memory, N, sp_forward<Args>(args)...);
object = memory; object = memory;
} }
#endif #endif
@@ -99,8 +100,9 @@ namespace boost {
array_construct_list(memory, N, list); array_construct_list(memory, N, list);
object = memory; object = memory;
} }
void construct_list(T* memory, const T* list, std::size_t n) { template<std::size_t M>
array_construct_list(memory, N, list, n); void construct_list(T* memory, const T* list) {
array_construct_list<T, M>(memory, N, list);
object = memory; object = memory;
} }
void construct_noinit(T* memory) { void construct_noinit(T* memory) {

12
include/boost/smart_ptr/detail/array_utility.hpp
View File

@@ -17,7 +17,6 @@ namespace boost {
namespace detail { namespace detail {
template<typename T> template<typename T>
inline void array_destroy(T*, std::size_t, boost::true_type) { inline void array_destroy(T*, std::size_t, boost::true_type) {
// do nothing
} }
template<typename T> template<typename T>
inline void array_destroy(T* memory, std::size_t size, boost::false_type) { inline void array_destroy(T* memory, std::size_t size, boost::false_type) {
@@ -56,7 +55,7 @@ namespace boost {
} }
#if defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_RVALUE_REFS)
template<typename T> template<typename T>
inline void array_construct_value(T* memory, std::size_t size, T&& value) { inline void array_construct(T* memory, std::size_t size, T&& value) {
std::size_t i = 0; std::size_t i = 0;
try { try {
for (; i < size; i++) { for (; i < size; i++) {
@@ -70,7 +69,7 @@ namespace boost {
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) #if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename T, typename... Args> template<typename T, typename... Args>
inline void array_construct_args(T* memory, std::size_t size, Args&&... args) { inline void array_construct(T* memory, std::size_t size, Args&&... args) {
std::size_t i = 0; std::size_t i = 0;
try { try {
for (; i < size; i++) { for (; i < size; i++) {
@@ -97,13 +96,13 @@ namespace boost {
throw; throw;
} }
} }
template<typename T> template<typename T, std::size_t N>
inline void array_construct_list(T* memory, std::size_t size, const T* list, std::size_t n) { inline void array_construct_list(T* memory, std::size_t size, const T* list) {
std::size_t i = 0; std::size_t i = 0;
try { try {
for (; i < size; i++) { for (; i < size; i++) {
void* p1 = memory + i; void* p1 = memory + i;
::new(p1) T(list[i % n]); ::new(p1) T(list[i % N]);
} }
} catch (...) { } catch (...) {
array_destroy(memory, i); array_destroy(memory, i);
@@ -112,7 +111,6 @@ namespace boost {
} }
template<typename T> template<typename T>
inline void array_construct_noinit(T*, std::size_t, boost::true_type) { inline void array_construct_noinit(T*, std::size_t, boost::true_type) {
// do nothing
} }
template<typename T> template<typename T>
inline void array_construct_noinit(T* memory, std::size_t size, boost::false_type) { inline void array_construct_noinit(T* memory, std::size_t size, boost::false_type) {

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

@@ -140,7 +140,7 @@ namespace boost {
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
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, p3, M); d2->construct_list<M>(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
template<typename T> template<typename T>
@@ -163,7 +163,7 @@ namespace boost {
p3 = reinterpret_cast<T3*>(list); p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2); p1 = reinterpret_cast<T1*>(p2);
d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1); d2 = get_deleter<boost::detail::array_deleter<T2[N]> >(s1);
d2->construct_list(p2, p3, M); d2->construct_list<M>(p2, p3);
return boost::shared_ptr<T>(s1, p1); return boost::shared_ptr<T>(s1, p1);
} }
#if defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_RVALUE_REFS)