summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp')
-rw-r--r--3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp b/3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp
index 06aa456..4ba509c 100644
--- a/3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp
+++ b/3rdParty/Boost/src/boost/smart_ptr/detail/sp_counted_base_w32.hpp
@@ -24,7 +24,7 @@
// formulation
//
-#include <boost/detail/interlocked.hpp>
+#include <boost/smart_ptr/detail/sp_interlocked.hpp>
#include <boost/detail/workaround.hpp>
#include <boost/detail/sp_typeinfo.hpp>
@@ -67,10 +67,11 @@ public:
}
virtual void * get_deleter( sp_typeinfo const & ti ) = 0;
+ virtual void * get_untyped_deleter() = 0;
void add_ref_copy()
{
- BOOST_INTERLOCKED_INCREMENT( &use_count_ );
+ BOOST_SP_INTERLOCKED_INCREMENT( &use_count_ );
}
bool add_ref_lock() // true on success
@@ -85,11 +86,11 @@ public:
// work around a code generation bug
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
- 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
}
@@ -97,7 +98,7 @@ public:
void release() // nothrow
{
- if( BOOST_INTERLOCKED_DECREMENT( &use_count_ ) == 0 )
+ if( BOOST_SP_INTERLOCKED_DECREMENT( &use_count_ ) == 0 )
{
dispose();
weak_release();
@@ -106,12 +107,12 @@ public:
void weak_add_ref() // nothrow
{
- BOOST_INTERLOCKED_INCREMENT( &weak_count_ );
+ BOOST_SP_INTERLOCKED_INCREMENT( &weak_count_ );
}
void weak_release() // nothrow
{
- if( BOOST_INTERLOCKED_DECREMENT( &weak_count_ ) == 0 )
+ if( BOOST_SP_INTERLOCKED_DECREMENT( &weak_count_ ) == 0 )
{
destroy();
}