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
|
|
|
//
|
|
|
|
// sp_array_n_test.cpp
|
|
|
|
//
|
|
|
|
// Copyright (c) 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/shared_ptr.hpp>
|
|
|
|
#include <boost/weak_ptr.hpp>
|
|
|
|
#include <boost/enable_shared_from_this.hpp>
|
2020-01-01 08:29:47 -05:00
|
|
|
#include <boost/core/lightweight_test.hpp>
|
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
|
|
|
#include <memory>
|
|
|
|
#include <utility>
|
|
|
|
|
|
|
|
class X: public boost::enable_shared_from_this< X >
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
|
|
static int allocations;
|
|
|
|
static int instances;
|
|
|
|
|
|
|
|
X()
|
|
|
|
{
|
|
|
|
++instances;
|
|
|
|
}
|
|
|
|
|
|
|
|
~X()
|
|
|
|
{
|
|
|
|
--instances;
|
|
|
|
}
|
|
|
|
|
|
|
|
void* operator new[]( std::size_t n )
|
|
|
|
{
|
|
|
|
++allocations;
|
|
|
|
return ::operator new[]( n );
|
|
|
|
}
|
|
|
|
|
|
|
|
void operator delete[]( void* p )
|
|
|
|
{
|
|
|
|
--allocations;
|
|
|
|
::operator delete[]( p );
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
X( X const& );
|
|
|
|
X& operator=( X const& );
|
|
|
|
};
|
|
|
|
|
|
|
|
int X::allocations = 0;
|
|
|
|
int X::instances = 0;
|
|
|
|
|
|
|
|
template< class T> class array_deleter
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
|
|
|
|
static int calls;
|
|
|
|
|
|
|
|
void operator()( T * p ) const
|
|
|
|
{
|
|
|
|
++calls;
|
|
|
|
delete[] p;
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
|
|
|
|
template< class Y > void operator()( Y * p ) const;
|
|
|
|
};
|
|
|
|
|
|
|
|
template< class T > int array_deleter< T >::calls = 0;
|
|
|
|
|
|
|
|
int main()
|
|
|
|
{
|
|
|
|
BOOST_TEST( X::allocations == 0 );
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr<X[3]> px;
|
|
|
|
BOOST_TEST( !px );
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 0 );
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
|
|
|
|
boost::shared_ptr<X[3]> px2( new X[ 3 ] );
|
|
|
|
BOOST_TEST( px2 );
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
px2[0].shared_from_this();
|
|
|
|
BOOST_ERROR( "px2[0].shared_from_this() failed to throw" );
|
|
|
|
}
|
|
|
|
catch( boost::bad_weak_ptr const& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
catch( ... )
|
|
|
|
{
|
|
|
|
BOOST_ERROR( "px2[0].shared_from_this() threw something else than bad_weak_ptr" );
|
|
|
|
}
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 1 );
|
|
|
|
BOOST_TEST( X::instances == 3 );
|
|
|
|
|
|
|
|
{
|
|
|
|
X & rx = px2[ 0 ];
|
|
|
|
BOOST_TEST( &rx == px2.get() );
|
|
|
|
}
|
|
|
|
|
|
|
|
boost::shared_ptr<X const[3]> px3( px2 );
|
|
|
|
BOOST_TEST( px3 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px3 ) && !( px3 < px2 ) );
|
|
|
|
|
|
|
|
{
|
|
|
|
X const & rx = px3[ 1 ];
|
|
|
|
BOOST_TEST( &rx == px3.get() + 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
px3.reset();
|
|
|
|
px3 = px2;
|
|
|
|
BOOST_TEST( px3 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px3 ) && !( px3 < px2 ) );
|
|
|
|
|
|
|
|
boost::shared_ptr<X volatile[3]> px4( px2 );
|
|
|
|
BOOST_TEST( px4 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px4 ) && !( px4 < px2 ) );
|
|
|
|
|
|
|
|
{
|
|
|
|
X volatile & rx = px4[ 2 ];
|
|
|
|
BOOST_TEST( &rx == px4.get() + 2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
px4.reset();
|
|
|
|
px4 = px2;
|
|
|
|
BOOST_TEST( px4 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px4 ) && !( px4 < px2 ) );
|
|
|
|
|
|
|
|
boost::shared_ptr<void> px5( px2 );
|
|
|
|
BOOST_TEST( px5 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px5 ) && !( px5 < px2 ) );
|
|
|
|
|
|
|
|
px5.reset();
|
|
|
|
px5 = px2;
|
|
|
|
BOOST_TEST( px5 == px2 );
|
|
|
|
BOOST_TEST( !( px2 < px5 ) && !( px5 < px2 ) );
|
|
|
|
|
|
|
|
boost::weak_ptr<X[3]> wp( px );
|
|
|
|
BOOST_TEST( wp.lock() == px );
|
|
|
|
|
|
|
|
boost::weak_ptr<X[3]> wp2( px2 );
|
|
|
|
BOOST_TEST( wp2.lock() == px2 );
|
|
|
|
|
|
|
|
wp2.reset();
|
|
|
|
wp2 = px2;
|
|
|
|
BOOST_TEST( wp2.lock() == px2 );
|
|
|
|
|
|
|
|
boost::weak_ptr<X const[3]> wp3( px2 );
|
|
|
|
BOOST_TEST( wp3.lock() == px2 );
|
|
|
|
|
|
|
|
wp3.reset();
|
|
|
|
wp3 = px2;
|
|
|
|
BOOST_TEST( wp3.lock() == px2 );
|
|
|
|
|
|
|
|
boost::weak_ptr<X volatile[3]> wp4( px2 );
|
|
|
|
BOOST_TEST( wp4.lock() == px2 );
|
|
|
|
|
|
|
|
wp4.reset();
|
|
|
|
wp4 = px2;
|
|
|
|
BOOST_TEST( wp4.lock() == px2 );
|
|
|
|
|
|
|
|
boost::weak_ptr<void> wp5( px2 );
|
|
|
|
BOOST_TEST( wp5.lock() == px2 );
|
|
|
|
|
|
|
|
wp5.reset();
|
|
|
|
wp5 = px2;
|
|
|
|
BOOST_TEST( wp5.lock() == px2 );
|
|
|
|
|
|
|
|
px2.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 1 );
|
|
|
|
BOOST_TEST( X::instances == 3 );
|
|
|
|
|
|
|
|
px3.reset();
|
|
|
|
px4.reset();
|
|
|
|
px5.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 0 );
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
|
|
|
|
BOOST_TEST( wp2.lock() == 0 );
|
|
|
|
BOOST_TEST( wp3.lock() == 0 );
|
|
|
|
BOOST_TEST( wp4.lock() == 0 );
|
|
|
|
BOOST_TEST( wp5.lock() == 0 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr<X[5]> px( new X[ 5 ], array_deleter< X >() );
|
|
|
|
BOOST_TEST( X::allocations == 1 );
|
|
|
|
BOOST_TEST( X::instances == 5 );
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
px[0].shared_from_this();
|
|
|
|
BOOST_ERROR( "px[0].shared_from_this() failed to throw" );
|
|
|
|
}
|
|
|
|
catch( boost::bad_weak_ptr const& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
catch( ... )
|
|
|
|
{
|
|
|
|
BOOST_ERROR( "px[0].shared_from_this() threw something else than bad_weak_ptr" );
|
|
|
|
}
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 0 );
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
BOOST_TEST( array_deleter< X >::calls == 1 );
|
|
|
|
}
|
|
|
|
|
|
|
|
{
|
|
|
|
boost::shared_ptr<X[6]> px( new X[ 6 ], array_deleter< X >(), std::allocator< X >() );
|
|
|
|
BOOST_TEST( X::allocations == 1 );
|
|
|
|
BOOST_TEST( X::instances == 6 );
|
|
|
|
|
|
|
|
try
|
|
|
|
{
|
|
|
|
px[0].shared_from_this();
|
|
|
|
BOOST_ERROR( "px[0].shared_from_this() failed to throw" );
|
|
|
|
}
|
|
|
|
catch( boost::bad_weak_ptr const& )
|
|
|
|
{
|
|
|
|
}
|
|
|
|
catch( ... )
|
|
|
|
{
|
|
|
|
BOOST_ERROR( "px[0].shared_from_this() threw something else than bad_weak_ptr" );
|
|
|
|
}
|
|
|
|
|
|
|
|
px.reset();
|
|
|
|
|
|
|
|
BOOST_TEST( X::allocations == 0 );
|
|
|
|
BOOST_TEST( X::instances == 0 );
|
|
|
|
BOOST_TEST( array_deleter< X >::calls == 2 );
|
|
|
|
}
|
|
|
|
|
|
|
|
return boost::report_errors();
|
|
|
|
}
|