boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-08-03 14:44:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

For fixed size arrays upon constructor exception thrown destroy correctly.

Browse Source 
[SVN r81684]
This commit is contained in:
Glen Fernandes
2012-12-03 05:41:34 +00:00
parent 500913db6d
commit 5e5ff387fa
3 changed files with 110 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,13 +24,18 @@ namespace boost {
object(0) { object(0) {
} }
~array_deleter() { ~array_deleter() {
destroy(); destroy(size);
} }
void construct(T* memory) { void construct(T* memory) {
object = memory; object = memory;
for (std::size_t i = 0; i < size; i++) { for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i; try {
::new(p1) T(); void* p1 = memory + i;
::new(p1) T();
} catch (...) {
destroy(i);
throw;
}
} }
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
@@ -38,39 +43,59 @@ namespace boost {
void construct(T* memory, Args&&... args) { void construct(T* memory, Args&&... args) {
object = memory; object = memory;
for (std::size_t i = 0; i < size; i++) { for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i; try {
::new(p1) T(args...); void* p1 = memory + i;
::new(p1) T(args...);
} catch (...) {
destroy(i);
throw;
}
} }
} }
#endif #endif
void construct_list(T* memory, const T* list) { void construct_list(T* memory, const T* list) {
object = memory; object = memory;
for (std::size_t i = 0; i < size; i++) { for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i; try {
::new(p1) T(list[i]); void* p1 = memory + i;
::new(p1) T(list[i]);
} catch (...) {
destroy(i);
throw;
}
} }
} }
void construct_list(T* memory, const T* list, std::size_t n) { void construct_list(T* memory, const T* list, std::size_t n) {
object = memory; object = memory;
for (std::size_t i = 0; i < size; i++) { for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i; try {
::new(p1) T(list[i % n]); void* p1 = memory + i;
::new(p1) T(list[i % n]);
} catch (...) {
destroy(i);
throw;
}
} }
} }
void construct_noinit(T* memory) { void construct_noinit(T* memory) {
object = memory; object = memory;
for (std::size_t i = 0; i < size; i++) { for (std::size_t i = 0; i < size; i++) {
void* p1 = object + i; try {
::new(p1) T; void* p1 = memory + i;
::new(p1) T;
} catch (...) {
destroy(i);
throw;
}
} }
} }
void operator()(const void*) { void operator()(const void*) {
destroy(); destroy(size);
} }
private: private:
void destroy() { void destroy(std::size_t n) {
if (object) { if (object) {
for (std::size_t i = size; i > 0; ) { for (std::size_t i = n; i > 0; ) {
object[--i].~T(); object[--i].~T();
} }
object = 0; object = 0;
@@ -86,13 +111,18 @@ namespace boost {
: object(0) { : object(0) {
} }
~array_deleter() { ~array_deleter() {
destroy(); destroy(N);
} }
void construct(T* memory) { void construct(T* memory) {
object = memory; object = memory;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
void* p1 = object + i; try {
::new(p1) T(); void* p1 = memory + i;
::new(p1) T();
} catch (...) {
destroy(i);
throw;
}
} }
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS) #if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
@@ -100,39 +130,59 @@ namespace boost {
void construct(T* memory, Args&&... args) { void construct(T* memory, Args&&... args) {
object = memory; object = memory;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
void* p1 = object + i; try {
::new(p1) T(args...); void* p1 = memory + i;
::new(p1) T(args...);
} catch (...) {
destroy(i);
throw;
}
} }
} }
#endif #endif
void construct_list(T* memory, const T* list) { void construct_list(T* memory, const T* list) {
object = memory; object = memory;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
void* p1 = object + i; try {
::new(p1) T(list[i]); void* p1 = memory + i;
::new(p1) T(list[i]);
} catch (...) {
destroy(i);
throw;
}
} }
} }
void construct_list(T* memory, const T* list, std::size_t n) { void construct_list(T* memory, const T* list, std::size_t n) {
object = memory; object = memory;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
void* p1 = object + i; try {
::new(p1) T(list[i % n]); void* p1 = memory + i;
::new(p1) T(list[i % n]);
} catch (...) {
destroy(i);
throw;
}
} }
} }
void construct_noinit(T* memory) { void construct_noinit(T* memory) {
object = memory; object = memory;
for (std::size_t i = 0; i < N; i++) { for (std::size_t i = 0; i < N; i++) {
void* p1 = object + i; try {
::new(p1) T; void* p1 = memory + i;
::new(p1) T;
} catch (...) {
destroy(i);
throw;
}
} }
} }
void operator()(const void*) { void operator()(const void*) {
destroy(); destroy(N);
} }
private: private:
void destroy() { void destroy(std::size_t n) {
if (object) { if (object) {
for (std::size_t i = N; i > 0; ) { for (std::size_t i = n; i > 0; ) {
object[--i].~T(); object[--i].~T();
} }
object = 0; object = 0;

16
test/allocate_shared_array_throws_test.cpp
View File

@@ -43,5 +43,21 @@ int main() {
} catch (...) { } catch (...) {
BOOST_TEST(type::instances == 0); BOOST_TEST(type::instances == 0);
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
BOOST_TEST(type::instances == 0);
try {
boost::allocate_shared<type[6]>(std::allocator<type>());
BOOST_ERROR("allocate_shared did not throw");
} catch (...) {
BOOST_TEST(type::instances == 0);
}
BOOST_TEST(type::instances == 0);
try {
boost::allocate_shared<type[3][2]>(std::allocator<type>());
BOOST_ERROR("allocate_shared did not throw");
} catch (...) {
BOOST_TEST(type::instances == 0);
}
#endif
return boost::report_errors(); return boost::report_errors();
} }

16
test/make_shared_array_throws_test.cpp
View File

@@ -43,6 +43,22 @@ int main() {
} catch (...) { } catch (...) {
BOOST_TEST(type::instances == 0); BOOST_TEST(type::instances == 0);
} }
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
BOOST_TEST(type::instances == 0);
try {
boost::make_shared<type[6]>();
BOOST_ERROR("make_shared did not throw");
} catch (...) {
BOOST_TEST(type::instances == 0);
}
BOOST_TEST(type::instances == 0);
try {
boost::make_shared<type[3][2]>();
BOOST_ERROR("make_shared did not throw");
} catch (...) {
BOOST_TEST(type::instances == 0);
}
#endif
BOOST_TEST(type::instances == 0); BOOST_TEST(type::instances == 0);
try { try {
boost::make_shared_noinit<type[]>(6); boost::make_shared_noinit<type[]>(6);