King_DuckZ/Loki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixed variation of bug 2022935 by changing when functions check if strong-count is zero.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@904 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2008-11-10 05:59:59 +00:00
parent 464f643e19
commit c983337def
1 changed files with 33 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/loki/StrongPtr.h
View file

@ -359,10 +359,12 @@ public:
++m_weakCount; ++m_weakCount;
} }
inline void DecStrongCount( void ) inline bool DecStrongCount( void )
{ {
assert( 0 < m_strongCount ); assert( 0 < m_strongCount );
--m_strongCount; --m_strongCount;
const bool isZero = ( 0 == m_strongCount );
return isZero;
} }
inline void DecWeakCount( void ) inline void DecWeakCount( void )
@ -483,11 +485,12 @@ public:
m_Mutex.Unlock(); m_Mutex.Unlock();
} }
inline void DecStrongCount( void ) inline bool DecStrongCount( void )
{ {
m_Mutex.Lock(); m_Mutex.Lock();
TwoRefCountInfo::DecStrongCount(); const bool isZero = TwoRefCountInfo::DecStrongCount();
m_Mutex.Unlock(); m_Mutex.Unlock();
return isZero;
} }
inline void DecWeakCount( void ) inline void DecWeakCount( void )
@ -572,10 +575,6 @@ protected:
return Decrement( strong ); return Decrement( strong );
} }
void Increment( bool strong );
bool Decrement( bool strong );
bool HasStrongPointer( void ) const bool HasStrongPointer( void ) const
{ {
return m_counts->HasStrongPointer(); return m_counts->HasStrongPointer();
@ -604,6 +603,10 @@ private:
TwoRefCounts( void ); TwoRefCounts( void );
TwoRefCounts & operator = ( const TwoRefCounts & ); TwoRefCounts & operator = ( const TwoRefCounts & );
void Increment( bool strong );
bool Decrement( bool strong );
/// Pointer to all shared data. /// Pointer to all shared data.
Loki::Private::TwoRefCountInfo * m_counts; Loki::Private::TwoRefCountInfo * m_counts;
}; };
@ -696,15 +699,17 @@ protected:
bool Decrement( bool strong ) bool Decrement( bool strong )
{ {
bool noStrongPointers = false;
if ( strong ) if ( strong )
{ {
m_counts->DecStrongCount(); noStrongPointers = m_counts->DecStrongCount();
} }
else else
{ {
m_counts->DecWeakCount(); m_counts->DecWeakCount();
noStrongPointers = !m_counts->HasStrongPointer();
} }
return !m_counts->HasStrongPointer(); return noStrongPointers;
} }
bool HasStrongPointer( void ) const bool HasStrongPointer( void ) const
@ -855,7 +860,7 @@ template
template < class > class ConstnessPolicy = LOKI_DEFAULT_CONSTNESS template < class > class ConstnessPolicy = LOKI_DEFAULT_CONSTNESS
> >
class StrongPtr class StrongPtr
: public OwnershipPolicy : protected OwnershipPolicy
, public ConversionPolicy , public ConversionPolicy
, public CheckingPolicy< T * > , public CheckingPolicy< T * >
, public ResetPolicy< T > , public ResetPolicy< T >