boostorg/smart_ptr
1
0
Fork 1
mirror of https://github.com/boostorg/smart_ptr.git synced 2025-07-31 13:17:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove static_pointer_cast restriction; test dynamic cross cast.

Browse Source
This commit is contained in:
Peter Dimov
2016-09-10 20:07:47 +03:00
parent 8fac3c9f2f
commit 2ae3e4ba44
2 changed files with 49 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/boost/pointer_cast.hpp
View File

@ -94,8 +94,6 @@ template<class T, class U> std::unique_ptr<T> static_pointer_cast( std::unique_p
typedef typename std::unique_ptr<T>::element_type E; typedef typename std::unique_ptr<T>::element_type E;
detail::assert_safe_moving_upcast<T, U>();
return std::unique_ptr<T>( static_cast<E*>( r.release() ) ); return std::unique_ptr<T>( static_cast<E*>( r.release() ) );
} }

73
test/pointer_cast_test2.cpp
View File

@ -23,15 +23,15 @@ int main()
#include <boost/core/lightweight_test.hpp> #include <boost/core/lightweight_test.hpp>
#include <memory> #include <memory>
struct B struct B1
{ {
virtual ~B()
{
}
}; };
struct D: B struct D1: B1
{ {
~D1()
{
}
}; };
static void test_static_cast() static void test_static_cast()
@ -77,23 +77,18 @@ static void test_static_cast()
} }
{ {
std::unique_ptr<D> p1( new D ); std::unique_ptr<D1> p1( new D1 );
D * q1 = p1.get(); D1 * q1 = p1.get();
std::unique_ptr<B> p2 = boost::static_pointer_cast<B>( std::move( p1 ) ); std::unique_ptr<B1> p2 = boost::static_pointer_cast<B1>( std::move( p1 ) );
BOOST_TEST( p1.get() == 0 ); BOOST_TEST( p1.get() == 0 );
BOOST_TEST_EQ( p2.get(), q1 ); BOOST_TEST_EQ( p2.get(), q1 );
}
{ std::unique_ptr<D1> p3 = boost::static_pointer_cast<D1>( std::move( p2 ) );
std::unique_ptr<B> p1( new D );
B * q1 = p1.get();
std::unique_ptr<D> p2 = boost::static_pointer_cast<D>( std::move( p1 ) ); BOOST_TEST( p2.get() == 0 );
BOOST_TEST_EQ( p3.get(), q1 );
BOOST_TEST( p1.get() == 0 );
BOOST_TEST_EQ( p2.get(), q1 );
} }
} }
@ -144,37 +139,65 @@ static void test_const_cast()
} }
} }
struct B2
{
virtual ~B2()
{
}
};
struct C2
{
virtual ~C2()
{
}
};
struct D2: B2, C2
{
};
static void test_dynamic_cast() static void test_dynamic_cast()
{ {
{ {
std::unique_ptr<D> p1( new D ); std::unique_ptr<D2> p1( new D2 );
D * q1 = p1.get(); D2 * q1 = p1.get();
std::unique_ptr<B> p2 = boost::dynamic_pointer_cast<B>( std::move( p1 ) ); std::unique_ptr<B2> p2 = boost::dynamic_pointer_cast<B2>( std::move( p1 ) );
BOOST_TEST( p1.get() == 0 ); BOOST_TEST( p1.get() == 0 );
BOOST_TEST_EQ( p2.get(), q1 ); BOOST_TEST_EQ( p2.get(), q1 );
} }
{ {
std::unique_ptr<B> p1( new D ); std::unique_ptr<B2> p1( new D2 );
B * q1 = p1.get(); B2 * q1 = p1.get();
std::unique_ptr<D> p2 = boost::dynamic_pointer_cast<D>( std::move( p1 ) ); std::unique_ptr<D2> p2 = boost::dynamic_pointer_cast<D2>( std::move( p1 ) );
BOOST_TEST( p1.get() == 0 ); BOOST_TEST( p1.get() == 0 );
BOOST_TEST_EQ( p2.get(), q1 ); BOOST_TEST_EQ( p2.get(), q1 );
} }
{ {
std::unique_ptr<B> p1( new B ); std::unique_ptr<B2> p1( new B2 );
B * q1 = p1.get(); B2 * q1 = p1.get();
std::unique_ptr<D> p2 = boost::dynamic_pointer_cast<D>( std::move( p1 ) ); std::unique_ptr<D2> p2 = boost::dynamic_pointer_cast<D2>( std::move( p1 ) );
BOOST_TEST( p2.get() == 0 ); BOOST_TEST( p2.get() == 0 );
BOOST_TEST_EQ( p1.get(), q1 ); BOOST_TEST_EQ( p1.get(), q1 );
} }
{
D2 * q1 = new D2;
std::unique_ptr<B2> p1( q1 );
std::unique_ptr<C2> p2 = boost::dynamic_pointer_cast<C2>( std::move( p1 ) );
BOOST_TEST( p1.get() == 0 );
BOOST_TEST_EQ( p2.get(), q1 );
}
} }
static void test_reinterpret_cast() static void test_reinterpret_cast()