mirror of
https://github.com/boostorg/smart_ptr.git
synced 2025-10-11 23:15:27 +02:00
cb0797acf0
Implement shared_ptr<X[]>, weak_ptr<X[]>. Refs #1113. ........ Fix shared_ptr<T[]> EDG issues. ........ Disable make_shared<T> overloads when T is Q[]. ........ Add catch(...) clauses to sp_array_test.cpp. ........ Add allocate_shared and make_shared for shared_ptr arrays of runtime size. Fulfills need for allocate_shared_array and make_shared_array. ........ Update Jamfile.v2 to run make_shared array tests and allocate_shared array tests. ........ Fix g++ issues. ........ Add specialization of sp_if_not_array<T[N]>. ........ Rename make_shared.hpp to make_shared_object.hpp, include from make_shared.hpp. ........ Add make_shared_array_args_test.cpp. ........ Add support for make_shared of array of arrays. Correctly destroy elements and construct elements for the variadic template constructor variants. ........ Fix sp_convertible<T const[], T const[]>. ........ Update smart_ptr/detail/array_helper to have create and create_noinit for non-array case. ........ Rename sp_convertible_test.cpp to shared_ptr_convertible_test.cpp. ........ Don't treat array_helper create and create_noinit for array types as a special case. ........ Add sp_convertible_test.cpp. ........ Fix array_helper (create_noinit and use of args...). ........ Update allocate_shared and make_shared to treat multidimensional array as single dimension. Remove detail array_helper. Add detail array traits. Update tests. ........ Simplify array_deleter interface ........ Add missing semicolon. ........ Fix typo. ........ Add tests for variadic template constructors overload of array forms of make_shared and allocate_shared for multidimensional arrays and up to 9 constructor arguments. ........ Add support for shared_ptr<X[N>. ........ Add C++11 initializer list support for make_shared and allocate_shared array forms. ........ Clean up code in allocate_shared_array.hpp and make_shared_array.hpp ........ Change make_shared and allocate_shared array form semantics with initializer lists overload that takes no size. ........ Disable make_shared for arrays when the compiler doesn't support partial specialization or SFINAE. ........ For allocate_shared and make_shared: Separate test case that g++ does support yet. Remove macros testing for no partial specialization in traits. Add additional traits. ........ Actually remove test cases from make_shared_array_create_test.cpp and allocate_shared_array_create_test.cpp that g++ does not handle. ........ Add overloads to support fixed size arrays, T[N], to allocate_shared (variadic) and make_shared (variadic) and make_shared_noinit. ........ Add additional overload for make_shared and allocate_shared for arrays for fixed size arrays and initializer lists. ........ Add assertion to overload of make_shared and allocate_shared for T[N] with initializer lists. Rename detail type to be more intuitive. ........ Add allocate_shared_array_args_test.cpp. ........ Keep old definition of sp_assert_convertible when BOOST_SP_NO_SP_CONVERTIBLE is set. ........ Updated shared_array to match shared_ptr. Refs #1113. ........ Add final overload of make_shared and allocate_shared (array forms) for T[][N] with C++11 initializer lists. ........ Change traits for initializer list for g++ ........ Tidy long line formatting in allocate_shared_array.hpp and make_shared_array.hpp ........ Update tests for make_shared and allocate_shared array forms, for normal case, initializer lists, variadic template arguments, for arrays and fixed size arrays. ........ Update Jamfile.v2 with two new smart_ptr tests for allocate_shared and make_shared ........ [SVN r81339]
126 lines
4.3 KiB
C++
126 lines
4.3 KiB
C++
/*
|
|
* 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)
|
|
*/
|
|
#include <boost/detail/lightweight_test.hpp>
|
|
#include <boost/smart_ptr/allocate_shared_array.hpp>
|
|
#include <boost/smart_ptr/weak_ptr.hpp>
|
|
#include <boost/type_traits/alignment_of.hpp>
|
|
|
|
class type {
|
|
public:
|
|
static unsigned int instances;
|
|
explicit type(int = 0, int = 0)
|
|
: member() {
|
|
instances++;
|
|
}
|
|
~type() {
|
|
instances--;
|
|
}
|
|
private:
|
|
type(const type&);
|
|
type& operator=(const type&);
|
|
double member;
|
|
};
|
|
|
|
unsigned int type::instances = 0;
|
|
|
|
int main() {
|
|
{
|
|
boost::shared_ptr<int[]> a1 = boost::allocate_shared<int[]>(std::allocator<int>(), 3);
|
|
int* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
|
|
BOOST_TEST(a1[0] == 0);
|
|
BOOST_TEST(a1[1] == 0);
|
|
BOOST_TEST(a1[2] == 0);
|
|
}
|
|
{
|
|
boost::shared_ptr<const int[]> a1 = boost::allocate_shared<const int[]>(std::allocator<int>(), 3);
|
|
const int* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<int>::value == 0);
|
|
BOOST_TEST(a1[0] == 0);
|
|
BOOST_TEST(a1[1] == 0);
|
|
BOOST_TEST(a1[2] == 0);
|
|
}
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<type[]> a1 = boost::allocate_shared<type[]>(std::allocator<type>(), 3);
|
|
type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
boost::weak_ptr<type[]> w1 = a1;
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<const type[]> a1 = boost::allocate_shared<const type[]>(std::allocator<type>(), 3);
|
|
const type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
#if defined(BOOST_HAS_VARIADIC_TMPL) && defined(BOOST_HAS_RVALUE_REFS)
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<type[]> a1 = boost::allocate_shared<type[]>(std::allocator<type>(), 3, 1, 5);
|
|
type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
boost::weak_ptr<type[]> w1 = a1;
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<type[3]> a1 = boost::allocate_shared<type[3]>(std::allocator<type>(), 1, 5);
|
|
type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
boost::weak_ptr<type[3]> w1 = a1;
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<const type[]> a1 = boost::allocate_shared<const type[]>(std::allocator<type>(), 3, 1, 5);
|
|
const type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
BOOST_TEST(type::instances == 0);
|
|
{
|
|
boost::shared_ptr<const type[3]> a1 = boost::allocate_shared<const type[3]>(std::allocator<type>(), 1, 5);
|
|
const type* a2 = a1.get();
|
|
BOOST_TEST(a1.use_count() == 1);
|
|
BOOST_TEST(a2 != 0);
|
|
BOOST_TEST(size_t(a2) % boost::alignment_of<type>::value == 0);
|
|
BOOST_TEST(type::instances == 3);
|
|
a1.reset();
|
|
BOOST_TEST(type::instances == 0);
|
|
}
|
|
#endif
|
|
return boost::report_errors();
|
|
}
|