boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2026-05-03 19:40:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for make_shared of array of arrays. Correctly destroy elements and construct elements for the variadic template constructor variants.

Browse Source 
[SVN r81229]
This commit is contained in:
Glen Fernandes
2012-11-07 14:42:10 +00:00
parent 6e873de0fa
commit dc5406aa5a
6 changed files with 247 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/boost/smart_ptr/allocate_shared_array.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
#define BOOST_SMART_PTR_ALLOCATE_SHARED_ARRAY_HPP
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/smart_ptr/detail/allocate_array_helper.hpp>
#include <boost/smart_ptr/detail/array_deleter.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>
include/boost/smart_ptr/detail/array_deleter.hpp
+5 -7
View File
@@ -10,6 +10,7 @@
#define BOOST_SMART_PTR_DETAIL_ARRAY_DELETER_HPP
#include <boost/config.hpp>
#include <boost/smart_ptr/detail/array_helper.hpp>
#include <cstddef>
namespace boost {
@@ -25,23 +26,20 @@ namespace boost {
}
void construct(T* memory, std::size_t count) {
for (object = memory; size < count; size++) {
void* p1 = object + size;
::new(p1) T();
array_helper<T>::create(object[size]);
}
}
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename... Args>
void construct(T* memory, std::size_t count, Args&&... args) {
for (object = memory; size < count; size++) {
void* p1 = object + size;
::new(p1) T(args...);
array_helper<T>::create(object[size], args...);
}
}
#endif
void construct_noinit(T* memory, std::size_t count) {
for (object = memory; size < count; size++) {
void* p1 = object + size;
::new(p1) T;
array_helper<T>::create_noinit(object[size]);
}
}
void operator()(T*) {
@@ -50,7 +48,7 @@ namespace boost {
private:
void destroy() {
while (size > 0) {
object[--size].~T();
array_helper<T>::destroy(object[--size]);
}
}
std::size_t size;
include/boost/smart_ptr/detail/array_helper.hpp
+64
View File
@@ -0,0 +1,64 @@
/*
* Copyright (c) 2012 Glen Joseph Fernandes
* glenfe at live dot com
*
* Distributed under the Boost Software License,
* Version 1.0. (See accompanying file LICENSE_1_0.txt
* or copy at http://boost.org/LICENSE_1_0.txt)
*/
#ifndef BOOST_SMART_PTR_DETAIL_ARRAY_HELPER_HPP
#define BOOST_SMART_PTR_DETAIL_ARRAY_HELPER_HPP
namespace boost {
namespace detail {
template<typename T>
struct array_helper {
static void destroy(T& value) {
value.~T();
}
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename... Args>
static void create(T& value, Args... args) {
void* p1 = &value;
::new(p1) T(args...);
}
#endif
};
#if !defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
template<typename T, size_t N>
struct array_helper<T[N]> {
static void create(T value[N]) {
void* p1 = &value;
::new(p1) T[N]();
}
static void create_noinit(T value[N]) {
void* p1 = &value;
::new(p1) T[N];
}
static void destroy(T value[N]) {
array_helper<T>::destroy(value[N-1]);
array_helper<T[N-1]>::destroy(value);
}
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename... Args>
static void create(T value[N], Args... args) {
array_helper<T[N-1]>::create(value, args);
array_helper<T>::create(value[N-1], args);
}
#endif
};
template<typename T>
struct array_helper<T[0]> {
static void destroy(T[]) {
}
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
template<typename... Args>
static void create(T[], Args...) {
}
#endif
};
#endif
}
}
#endif
include/boost/smart_ptr/make_shared_array.hpp
+1 -1
View File
@@ -9,7 +9,7 @@
#ifndef BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
#define BOOST_SMART_PTR_MAKE_SHARED_ARRAY_HPP
#include <boost/shared_ptr.hpp>
#include <boost/smart_ptr/shared_ptr.hpp>
#include <boost/smart_ptr/detail/array_deleter.hpp>
#include <boost/smart_ptr/detail/make_array_helper.hpp>
#include <boost/smart_ptr/detail/sp_if_array.hpp>