|
|
Boost-Commit : |
Subject: [Boost-commit] svn:boost r81800 - in branches/release: . boost boost/smart_ptr boost/smart_ptr/detail
From: glenfe_at_[hidden]
Date: 2012-12-08 13:30:28
Author: glenfe
Date: 2012-12-08 13:30:27 EST (Sat, 08 Dec 2012)
New Revision: 81800
URL: http://svn.boost.org/trac/boost/changeset/81800
Log:
Merged revision(s) 81748-81750,81752,81759,81782 from trunk:
Refactoring in detail array_deleter before adding support for special-casing trivially default-constructible construction and trivially destroyable destruction.
........
Special case array construction for trivially default-constructible types and array destruction for trivially-destroyable types.
........
Optimization in initialization overload of array_construct for compilers to optimize it into the equivalent of a memset
........
Correctly use r-value reference semantics for Args and T in array utilities
........
Change ordering of overload definitions in array_utility.hpp
........
Convert function parameter for inner array size into template parameter and make identifiers in array_deleter consistent with those in array_utility
........
Added:
branches/release/boost/smart_ptr/detail/array_utility.hpp
- copied, changed from r81750, /trunk/boost/smart_ptr/detail/array_utility.hpp
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/smart_ptr/ (props changed)
Text files modified:
branches/release/boost/smart_ptr/allocate_shared_array.hpp | 5
branches/release/boost/smart_ptr/detail/array_deleter.hpp | 180 ++++++++-------------------------------
branches/release/boost/smart_ptr/detail/array_utility.hpp | 36 ++++----
branches/release/boost/smart_ptr/make_shared_array.hpp | 5
4 files changed, 62 insertions(+), 164 deletions(-)
Modified: branches/release/boost/smart_ptr/allocate_shared_array.hpp
==============================================================================
--- branches/release/boost/smart_ptr/allocate_shared_array.hpp (original)
+++ branches/release/boost/smart_ptr/allocate_shared_array.hpp 2012-12-08 13:30:27 EST (Sat, 08 Dec 2012)
@@ -13,7 +13,6 @@
#include <boost/smart_ptr/detail/allocate_array_helper.hpp>
#include <boost/smart_ptr/detail/array_deleter.hpp>
#include <boost/smart_ptr/detail/array_traits.hpp>
-#include <boost/smart_ptr/detail/sp_forward.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
#include <initializer_list>
@@ -142,7 +141,7 @@
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
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);
}
template<typename T, typename A>
@@ -166,7 +165,7 @@
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
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);
}
#if defined(BOOST_HAS_RVALUE_REFS)
Modified: branches/release/boost/smart_ptr/detail/array_deleter.hpp
==============================================================================
--- branches/release/boost/smart_ptr/detail/array_deleter.hpp (original)
+++ branches/release/boost/smart_ptr/detail/array_deleter.hpp 2012-12-08 13:30:27 EST (Sat, 08 Dec 2012)
@@ -9,8 +9,8 @@
#ifndef BOOST_SMART_PTR_DETAIL_ARRAY_DELETER_HPP
#define BOOST_SMART_PTR_DETAIL_ARRAY_DELETER_HPP
-#include <boost/config.hpp>
-#include <cstddef>
+#include <boost/smart_ptr/detail/array_utility.hpp>
+#include <boost/smart_ptr/detail/sp_forward.hpp>
namespace boost {
namespace detail {
@@ -24,97 +24,47 @@
object(0) {
}
~array_deleter() {
- destroy(size);
+ if (object) {
+ array_destroy(object, size);
+ }
}
void construct(T* memory) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T();
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, size);
+ object = memory;
}
#if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T(value);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, size, sp_forward<T>(value));
+ object = memory;
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename... Args>
void construct(T* memory, Args&&... args) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T(args...);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, size, sp_forward<Args>(args)...);
+ object = memory;
}
#endif
#endif
void construct_list(T* memory, const T* list) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T(list[i]);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct_list(memory, size, list);
+ object = memory;
}
- void construct_list(T* memory, const T* list, std::size_t n) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T(list[i % n]);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ template<std::size_t M>
+ void construct_list(T* memory, const T* list) {
+ array_construct_list<T, M>(memory, size, list);
+ object = memory;
}
void construct_noinit(T* memory) {
- std::size_t i = 0;
- try {
- for (object = memory; i < size; i++) {
- void* p1 = memory + i;
- ::new(p1) T;
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct_noinit(memory, size);
+ object = memory;
}
void operator()(const void*) {
- destroy(size);
- }
- private:
- void destroy(std::size_t n) {
if (object) {
- for (std::size_t i = n; i > 0; ) {
- object[--i].~T();
- }
+ array_destroy(object, size);
object = 0;
}
}
+ private:
std::size_t size;
T* object;
};
@@ -125,97 +75,47 @@
: object(0) {
}
~array_deleter() {
- destroy(N);
+ if (object) {
+ array_destroy(object, N);
+ }
}
void construct(T* memory) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T();
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, N);
+ object = memory;
}
#if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T(value);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, N, sp_forward<T>(value));
+ object = memory;
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename... Args>
void construct(T* memory, Args&&... args) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T(args...);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct(memory, N, sp_forward<Args>(args)...);
+ object = memory;
}
#endif
#endif
void construct_list(T* memory, const T* list) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T(list[i]);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct_list(memory, N, list);
+ object = memory;
}
- void construct_list(T* memory, const T* list, std::size_t n) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T(list[i % n]);
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ template<std::size_t M>
+ void construct_list(T* memory, const T* list) {
+ array_construct_list<T, M>(memory, N, list);
+ object = memory;
}
void construct_noinit(T* memory) {
- std::size_t i = 0;
- try {
- for (object = memory; i < N; i++) {
- void* p1 = memory + i;
- ::new(p1) T;
- }
- } catch (...) {
- destroy(i);
- throw;
- }
+ array_construct_noinit(memory, N);
+ object = memory;
}
void operator()(const void*) {
- destroy(N);
- }
- private:
- void destroy(std::size_t n) {
if (object) {
- for (std::size_t i = n; i > 0; ) {
- object[--i].~T();
- }
+ array_destroy(object, N);
object = 0;
}
}
+ private:
T* object;
};
}
Copied: branches/release/boost/smart_ptr/detail/array_utility.hpp (from r81750, /trunk/boost/smart_ptr/detail/array_utility.hpp)
==============================================================================
--- /trunk/boost/smart_ptr/detail/array_utility.hpp (original)
+++ branches/release/boost/smart_ptr/detail/array_utility.hpp 2012-12-08 13:30:27 EST (Sat, 08 Dec 2012)
@@ -16,11 +16,6 @@
namespace boost {
namespace detail {
template<typename T>
- inline void array_destroy(T* memory, std::size_t size) {
- boost::has_trivial_destructor<T> type;
- array_destroy(memory, size, type);
- }
- template<typename T>
inline void array_destroy(T*, std::size_t, boost::true_type) {
}
template<typename T>
@@ -30,9 +25,9 @@
}
}
template<typename T>
- inline void array_construct(T* memory, std::size_t size) {
- boost::has_trivial_default_constructor<T> type;
- array_construct(memory, size, type);
+ inline void array_destroy(T* memory, std::size_t size) {
+ boost::has_trivial_destructor<T> type;
+ array_destroy(memory, size, type);
}
template<typename T>
inline void array_construct(T* memory, std::size_t size, boost::true_type) {
@@ -53,9 +48,14 @@
throw;
}
}
+ template<typename T>
+ inline void array_construct(T* memory, std::size_t size) {
+ boost::has_trivial_default_constructor<T> type;
+ array_construct(memory, size, type);
+ }
#if defined(BOOST_HAS_RVALUE_REFS)
template<typename T>
- inline void array_construct(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;
try {
for (; i < size; i++) {
@@ -69,7 +69,7 @@
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
template<typename T, typename... Args>
- inline void array_construct(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;
try {
for (; i < size; i++) {
@@ -96,13 +96,13 @@
throw;
}
}
- template<typename T>
- inline void array_construct_list(T* memory, std::size_t size, const T* list, std::size_t n) {
+ template<typename T, std::size_t N>
+ inline void array_construct_list(T* memory, std::size_t size, const T* list) {
std::size_t i = 0;
try {
for (; i < size; i++) {
void* p1 = memory + i;
- ::new(p1) T(list[i % n]);
+ ::new(p1) T(list[i % N]);
}
} catch (...) {
array_destroy(memory, i);
@@ -110,11 +110,6 @@
}
}
template<typename T>
- inline void array_construct_noinit(T* memory, std::size_t size) {
- boost::has_trivial_default_constructor<T> type;
- array_construct_noinit(memory, size, type);
- }
- template<typename T>
inline void array_construct_noinit(T*, std::size_t, boost::true_type) {
}
template<typename T>
@@ -130,6 +125,11 @@
throw;
}
}
+ template<typename T>
+ inline void array_construct_noinit(T* memory, std::size_t size) {
+ boost::has_trivial_default_constructor<T> type;
+ array_construct_noinit(memory, size, type);
+ }
}
}
Modified: branches/release/boost/smart_ptr/make_shared_array.hpp
==============================================================================
--- branches/release/boost/smart_ptr/make_shared_array.hpp (original)
+++ branches/release/boost/smart_ptr/make_shared_array.hpp 2012-12-08 13:30:27 EST (Sat, 08 Dec 2012)
@@ -13,7 +13,6 @@
#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_forward.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>
#if !defined(BOOST_NO_CXX11_HDR_INITIALIZER_LIST)
#include <initializer_list>
@@ -141,7 +140,7 @@
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
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);
}
template<typename T>
@@ -164,7 +163,7 @@
p3 = reinterpret_cast<T3*>(list);
p1 = reinterpret_cast<T1*>(p2);
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);
}
#if defined(BOOST_HAS_RVALUE_REFS)
Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk