forked from boostorg/smart_ptr
Merge 47357 (atomic access N2674 edits) from trunk to release.
[SVN r47358]
This commit is contained in:
+11
-11
@@ -25,31 +25,31 @@ int main()
|
||||
boost::shared_ptr<X> px( new X );
|
||||
|
||||
{
|
||||
boost::shared_ptr<X> p2 = px.atomic_load();
|
||||
boost::shared_ptr<X> p2 = boost::atomic_load( &px );
|
||||
BOOST_TEST_SP_EQ( p2, px );
|
||||
|
||||
boost::shared_ptr<X> px2( new X );
|
||||
px.atomic_store( px2 );
|
||||
boost::atomic_store( &px, px2 );
|
||||
BOOST_TEST_SP_EQ( px, px2 );
|
||||
|
||||
p2 = px.atomic_load();
|
||||
p2 = boost::atomic_load( &px );
|
||||
BOOST_TEST_SP_EQ( p2, px );
|
||||
BOOST_TEST_SP_EQ( p2, px2 );
|
||||
|
||||
boost::shared_ptr<X> px3( new X );
|
||||
boost::shared_ptr<X> p3 = px.atomic_swap( px3 );
|
||||
boost::shared_ptr<X> p3 = boost::atomic_exchange( &px, px3 );
|
||||
BOOST_TEST_SP_EQ( p3, px2 );
|
||||
BOOST_TEST_SP_EQ( px, px3 );
|
||||
|
||||
boost::shared_ptr<X> px4( new X );
|
||||
boost::shared_ptr<X> cmp;
|
||||
|
||||
bool r = px.atomic_compare_swap( cmp, px4 );
|
||||
bool r = boost::atomic_compare_exchange( &px, &cmp, px4 );
|
||||
BOOST_TEST( !r );
|
||||
BOOST_TEST_SP_EQ( px, px3 );
|
||||
BOOST_TEST_SP_EQ( cmp, px3 );
|
||||
|
||||
r = px.atomic_compare_swap( cmp, px4 );
|
||||
r = boost::atomic_compare_exchange( &px, &cmp, px4 );
|
||||
BOOST_TEST( r );
|
||||
BOOST_TEST_SP_EQ( px, px4 );
|
||||
}
|
||||
@@ -59,26 +59,26 @@ int main()
|
||||
px.reset();
|
||||
|
||||
{
|
||||
boost::shared_ptr<X> p2 = px.atomic_load( boost::memory_order_acquire );
|
||||
boost::shared_ptr<X> p2 = boost::atomic_load_explicit( &px, boost::memory_order_acquire );
|
||||
BOOST_TEST_SP_EQ( p2, px );
|
||||
|
||||
boost::shared_ptr<X> px2( new X );
|
||||
px.atomic_store( px2, boost::memory_order_release );
|
||||
boost::atomic_store_explicit( &px, px2, boost::memory_order_release );
|
||||
BOOST_TEST_SP_EQ( px, px2 );
|
||||
|
||||
boost::shared_ptr<X> p3 = px.atomic_swap( boost::shared_ptr<X>(), boost::memory_order_acq_rel );
|
||||
boost::shared_ptr<X> p3 = boost::atomic_exchange_explicit( &px, boost::shared_ptr<X>(), boost::memory_order_acq_rel );
|
||||
BOOST_TEST_SP_EQ( p3, px2 );
|
||||
BOOST_TEST_SP_EQ( px, p2 );
|
||||
|
||||
boost::shared_ptr<X> px4( new X );
|
||||
boost::shared_ptr<X> cmp( px2 );
|
||||
|
||||
bool r = px.atomic_compare_swap( cmp, px4, boost::memory_order_acquire, boost::memory_order_relaxed );
|
||||
bool r = boost::atomic_compare_exchange_explicit( &px, &cmp, px4, boost::memory_order_acquire, boost::memory_order_relaxed );
|
||||
BOOST_TEST( !r );
|
||||
BOOST_TEST_SP_EQ( px, p2 );
|
||||
BOOST_TEST_SP_EQ( cmp, p2 );
|
||||
|
||||
r = px.atomic_compare_swap( cmp, px4, boost::memory_order_release, boost::memory_order_acquire );
|
||||
r = boost::atomic_compare_exchange_explicit( &px, &cmp, px4, boost::memory_order_release, boost::memory_order_acquire );
|
||||
BOOST_TEST( r );
|
||||
BOOST_TEST_SP_EQ( px, px4 );
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user