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

Added call to OnDereference to constructor.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@1100 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2011-09-13 00:50:05 +00:00
parent 3808e423f2
commit 3af86d72a1
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/loki/SmartPtr.h
View file

@ -1252,7 +1252,7 @@ namespace Loki
template <class> class SP1, template <class> class SP1,
template <class> class CNP1 template <class> class CNP1
> >
SmartPtr(const SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs) SmartPtr( const SmartPtr< T1, OP1, CP1, KP1, SP1, CNP1 >& rhs )
: SP(rhs), OP(rhs), KP(rhs), CP(rhs) : SP(rhs), OP(rhs), KP(rhs), CP(rhs)
{ {
KP::OnDereference( GetImpl( rhs ) ); KP::OnDereference( GetImpl( rhs ) );
@ -1268,7 +1268,7 @@ namespace Loki
template <class> class SP1, template <class> class SP1,
template <class> class CNP1 template <class> class CNP1
> >
SmartPtr(SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs) SmartPtr( SmartPtr< T1, OP1, CP1, KP1, SP1, CNP1 >& rhs )
: SP(rhs), OP(rhs), KP(rhs), CP(rhs) : SP(rhs), OP(rhs), KP(rhs), CP(rhs)
{ {
KP::OnDereference( GetImpl( rhs ) ); KP::OnDereference( GetImpl( rhs ) );
@ -1277,7 +1277,11 @@ namespace Loki
SmartPtr(RefToValue<SmartPtr> rhs) SmartPtr(RefToValue<SmartPtr> rhs)
: SP(rhs), OP(rhs), KP(rhs), CP(rhs) : SP(rhs), OP(rhs), KP(rhs), CP(rhs)
{} {
SmartPtr & ref = rhs;
KP::OnDereference( GetImpl( ref ) );
GetImplRef( *this ) = OP::Clone( GetImplRef( ref ) );
}
operator RefToValue<SmartPtr>() operator RefToValue<SmartPtr>()
{ return RefToValue<SmartPtr>(*this); } { return RefToValue<SmartPtr>(*this); }