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

Use BOOST_NO_CXX11_RVALUE_REFERENCES and BOOST_NO_CXX11_VARIADIC_TEMPLATES instead of the legacy macros. Rename identifiers of detail utility functions.

Browse Source 
[SVN r81886]
This commit is contained in:
Glen Fernandes
2012-12-13 04:04:23 +00:00
parent 5f0155cca6
commit 4ba8d879f1
18 changed files with 226 additions and 226 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/detail/array_deleter.hpp
+28 -28
View File
@@ -28,34 +28,34 @@ namespace boost {
array_destroy(object, size);
}
}
void construct(T* memory) {
array_construct(memory, size);
void init(T* memory) {
array_init(memory, size);
object = memory;
}
#if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) {
array_construct_value(memory, size, sp_forward<T>(value));
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
void init_value(T* memory, T&& value) {
array_init_value(memory, size, sp_forward<T>(value));
object = memory;
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args>
void construct(T* memory, Args&&... args) {
array_construct_args(memory, size, sp_forward<Args>(args)...);
void init_args(T* memory, Args&&... args) {
array_init_args(memory, size, sp_forward<Args>(args)...);
object = memory;
}
#endif
#endif
void construct_list(T* memory, const T* list) {
array_construct_list(memory, size, list);
void init_list(T* memory, const T* list) {
array_init_list(memory, size, list);
object = memory;
}
template<std::size_t M>
void construct_list(T* memory, const T* list) {
array_construct_list<T, M>(memory, size, list);
void init_list(T* memory, const T* list) {
array_init_list<T, M>(memory, size, list);
object = memory;
}
void construct_noinit(T* memory) {
array_construct_noinit(memory, size);
void noinit(T* memory) {
array_noinit(memory, size);
object = memory;
}
void operator()(const void*) {
@@ -79,34 +79,34 @@ namespace boost {
array_destroy(object, N);
}
}
void construct(T* memory) {
array_construct(memory, N);
void init(T* memory) {
array_init(memory, N);
object = memory;
}
#if defined(BOOST_HAS_RVALUE_REFS)
void construct(T* memory, T&& value) {
array_construct_value(memory, N, sp_forward<T>(value));
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
void init_value(T* memory, T&& value) {
array_init_value(memory, N, sp_forward<T>(value));
object = memory;
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename... Args>
void construct(T* memory, Args&&... args) {
array_construct_args(memory, N, sp_forward<Args>(args)...);
void init_args(T* memory, Args&&... args) {
array_init_args(memory, N, sp_forward<Args>(args)...);
object = memory;
}
#endif
#endif
void construct_list(T* memory, const T* list) {
array_construct_list(memory, N, list);
void init_list(T* memory, const T* list) {
array_init_list(memory, N, list);
object = memory;
}
template<std::size_t M>
void construct_list(T* memory, const T* list) {
array_construct_list<T, M>(memory, N, list);
void init_list(T* memory, const T* list) {
array_init_list<T, M>(memory, N, list);
object = memory;
}
void construct_noinit(T* memory) {
array_construct_noinit(memory, N);
void noinit(T* memory) {
array_noinit(memory, N);
object = memory;
}
void operator()(const void*) {
include/boost/smart_ptr/detail/array_utility.hpp
+14 -14
View File
@@ -30,13 +30,13 @@ namespace boost {
array_destroy(memory, size, type);
}
template<typename T>
inline void array_construct(T* memory, std::size_t size, boost::true_type) {
inline void array_init(T* memory, std::size_t size, boost::true_type) {
for (std::size_t i = 0; i < size; i++) {
memory[i] = T();
}
}
template<typename T>
inline void array_construct(T* memory, std::size_t size, boost::false_type) {
inline void array_init(T* memory, std::size_t size, boost::false_type) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -49,13 +49,13 @@ namespace boost {
}
}
template<typename T>
inline void array_construct(T* memory, std::size_t size) {
inline void array_init(T* memory, std::size_t size) {
boost::has_trivial_default_constructor<T> type;
array_construct(memory, size, type);
array_init(memory, size, type);
}
#if defined(BOOST_HAS_RVALUE_REFS)
#if !defined(BOOST_NO_CXX11_RVALUE_REFERENCES)
template<typename T>
inline void array_construct_value(T* memory, std::size_t size, T&& value) {
inline void array_init_value(T* memory, std::size_t size, T&& value) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -67,9 +67,9 @@ namespace boost {
throw;
}
}
#if defined(BOOST_HAS_VARIADIC_TMPL)
#if !defined(BOOST_NO_CXX11_VARIADIC_TEMPLATES)
template<typename T, typename... Args>
inline void array_construct_args(T* memory, std::size_t size, Args&&... args) {
inline void array_init_args(T* memory, std::size_t size, Args&&... args) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -84,7 +84,7 @@ namespace boost {
#endif
#endif
template<typename T>
inline void array_construct_list(T* memory, std::size_t size, const T* list) {
inline void array_init_list(T* memory, std::size_t size, const T* list) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -97,7 +97,7 @@ namespace boost {
}
}
template<typename T, std::size_t N>
inline void array_construct_list(T* memory, std::size_t size, const T* list) {
inline void array_init_list(T* memory, std::size_t size, const T* list) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -110,10 +110,10 @@ namespace boost {
}
}
template<typename T>
inline void array_construct_noinit(T*, std::size_t, boost::true_type) {
inline void array_noinit(T*, std::size_t, boost::true_type) {
}
template<typename T>
inline void array_construct_noinit(T* memory, std::size_t size, boost::false_type) {
inline void array_noinit(T* memory, std::size_t size, boost::false_type) {
std::size_t i = 0;
try {
for (; i < size; i++) {
@@ -126,9 +126,9 @@ namespace boost {
}
}
template<typename T>
inline void array_construct_noinit(T* memory, std::size_t size) {
inline void array_noinit(T* memory, std::size_t size) {
boost::has_trivial_default_constructor<T> type;
array_construct_noinit(memory, size, type);
array_noinit(memory, size, type);
}
}
}