feedc0de/boost_smart_ptr
1
0
Fork 0
forked from boostorg/smart_ptr
Code Pull Requests Activity

Merge branch 'develop'

Browse Source
This commit is contained in:
Peter Dimov
2014-02-26 15:10:01 +02:00
parent c759321782 3e625c07e8
commit 71b2f87e35
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/boost/smart_ptr/detail/atomic_count_win32.hpp
View File

@ -17,7 +17,7 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#include <boost/detail/interlocked.hpp> #include <boost/smart_ptr/detail/sp_interlocked.hpp>
namespace boost namespace boost
{ {
@ -35,12 +35,12 @@ public:
long operator++() long operator++()
{ {
return BOOST_INTERLOCKED_INCREMENT( &value_ ); return BOOST_SP_INTERLOCKED_INCREMENT( &value_ );
} }
long operator--() long operator--()
{ {
return BOOST_INTERLOCKED_DECREMENT( &value_ ); return BOOST_SP_INTERLOCKED_DECREMENT( &value_ );
} }
operator long() const operator long() const

14
include/boost/smart_ptr/detail/sp_counted_base_w32.hpp
View File

@ -24,7 +24,7 @@
// formulation // formulation
// //
#include <boost/detail/interlocked.hpp> #include <boost/smart_ptr/detail/sp_interlocked.hpp>
#include <boost/detail/workaround.hpp> #include <boost/detail/workaround.hpp>
#include <boost/detail/sp_typeinfo.hpp> #include <boost/detail/sp_typeinfo.hpp>
@ -71,7 +71,7 @@ public:
void add_ref_copy() void add_ref_copy()
{ {
BOOST_INTERLOCKED_INCREMENT( &use_count_ ); BOOST_SP_INTERLOCKED_INCREMENT( &use_count_ );
} }
bool add_ref_lock() // true on success bool add_ref_lock() // true on success
@ -86,11 +86,11 @@ public:
// work around a code generation bug // work around a code generation bug
long tmp2 = tmp + 1; long tmp2 = tmp + 1;
if( BOOST_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp2, tmp ) == tmp2 - 1 ) return true; if( BOOST_SP_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp2, tmp ) == tmp2 - 1 ) return true;
#else #else
if( BOOST_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp + 1, tmp ) == tmp ) return true; if( BOOST_SP_INTERLOCKED_COMPARE_EXCHANGE( &use_count_, tmp + 1, tmp ) == tmp ) return true;
#endif #endif
} }
@ -98,7 +98,7 @@ public:
void release() // nothrow void release() // nothrow
{ {
if( BOOST_INTERLOCKED_DECREMENT( &use_count_ ) == 0 ) if( BOOST_SP_INTERLOCKED_DECREMENT( &use_count_ ) == 0 )
{ {
dispose(); dispose();
weak_release(); weak_release();
@ -107,12 +107,12 @@ public:
void weak_add_ref() // nothrow void weak_add_ref() // nothrow
{ {
BOOST_INTERLOCKED_INCREMENT( &weak_count_ ); BOOST_SP_INTERLOCKED_INCREMENT( &weak_count_ );
} }
void weak_release() // nothrow void weak_release() // nothrow
{ {
if( BOOST_INTERLOCKED_DECREMENT( &weak_count_ ) == 0 ) if( BOOST_SP_INTERLOCKED_DECREMENT( &weak_count_ ) == 0 )
{ {
destroy(); destroy();
} }

4
include/boost/smart_ptr/detail/spinlock_w32.hpp
View File

@ -15,7 +15,7 @@
// http://www.boost.org/LICENSE_1_0.txt) // http://www.boost.org/LICENSE_1_0.txt)
// //
#include <boost/detail/interlocked.hpp> #include <boost/smart_ptr/detail/sp_interlocked.hpp>
#include <boost/smart_ptr/detail/yield_k.hpp> #include <boost/smart_ptr/detail/yield_k.hpp>
// BOOST_COMPILER_FENCE // BOOST_COMPILER_FENCE
@ -59,7 +59,7 @@ public:
bool try_lock() bool try_lock()
{ {
long r = BOOST_INTERLOCKED_EXCHANGE( &v_, 1 ); long r = BOOST_SP_INTERLOCKED_EXCHANGE( &v_, 1 );
BOOST_COMPILER_FENCE BOOST_COMPILER_FENCE