Merged revision(s) 81149, 81159, 81171, 81174, 81219-81220, 81222-81224, 81226, 81229-81239, 81242, 81253, 81257-81262, 81265-81268, 81271-81272, 81275-81277, 81299-81300 from trunk:
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]
2012-11-14 13:52:11 +00:00
|
|
|
// make_shared_array_args_test.cpp
|
|
|
|
//
|
|
|
|
// Copyright 2007-2009, 2012 Peter Dimov
|
|
|
|
//
|
|
|
|
// Distributed under the Boost Software License, Version 1.0.
|
|
|
|
// See accompanying file LICENSE_1_0.txt or copy at
|
|
|
|
// http://www.boost.org/LICENSE_1_0.txt
|
|
|
|
|
|
|
|
#include <boost/detail/lightweight_test.hpp>
|
|
|
|
#include <boost/make_shared.hpp>
|
|
|
|
#include <boost/shared_ptr.hpp>
|
|
|
|
#include <cstddef>
|
|
|
|
|
|
|
|
class X
|
|
|
|
{
|
|
|
|
private:
|
|
|
|
|
|
|
|
X( X const & );
|
|
|
|
X & operator=( X const & );
|
|
|
|
|
|
|
|
void * operator new[]( std::size_t n );
|
|
|
|
void operator delete[]( void * p );
|
|
|
|
|
|
|
|
public:
|
|
|
|
|
|
|
|
static int instances;
|
|
|
|
|
|
|
|
int v;
|
|
|
|
|
|
|
|
explicit X( int a1 = 0, int a2 = 0, int a3 = 0, int a4 = 0, int a5 = 0, int a6 = 0, int a7 = 0, int a8 = 0, int a9 = 0 ): v( a1+a2+a3+a4+a5+a6+a7+a8+a9 )
|
|
|
|
{
|
|
|
|
++instances;
|
|
|
|
}
|
|
|
|
|
|
|
|
~X()
|
|
|
|
{
|
|
|
|
--instances;
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
int X::instances = 0;
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 0 );
|
|
|
|
BOOST_TEST( px[1].v == 0 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
2012-12-15 20:20:20 +00:00
|
|
|
#if !defined( BOOST_NO_CXX11_VARIADIC_TEMPLATES ) && !defined( BOOST_NO_CXX11_RVALUE_REFERENCES )
|
Merged revision(s) 81149, 81159, 81171, 81174, 81219-81220, 81222-81224, 81226, 81229-81239, 81242, 81253, 81257-81262, 81265-81268, 81271-81272, 81275-81277, 81299-81300 from trunk:
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]
2012-11-14 13:52:11 +00:00
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1 );
|
|
|
|
BOOST_TEST( px[1].v == 1 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4, 5 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4+5 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4+5 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4, 5, 6 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4+5+6 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4+5+6 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4, 5, 6, 7 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4+5+6+7 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4+5+6+7 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4, 5, 6, 7, 8 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4+5+6+7+8 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4+5+6+7+8 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr< X[] > px = boost::make_shared< X[] >( 2, 1, 2, 3, 4, 5, 6, 7, 8, 9 );
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 2 );
|
|
|
|
BOOST_TEST( px[0].v == 1+2+3+4+5+6+7+8+9 );
|
|
|
|
BOOST_TEST( px[1].v == 1+2+3+4+5+6+7+8+9 );
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
return boost::report_errors();
|
|
|
|
}
|