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

Moved a monolithic base class from header file to new source file.

Browse source 
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@548 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
rich_sposato 2006-02-25 01:52:17 +00:00
parent 5a8e9c06f4
commit 9f532a3ea0
3 changed files with 191 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

164
include/loki/SmartPtr.h
View file

@ -207,6 +207,7 @@ namespace Loki
if (!--*pCount_) if (!--*pCount_)
{ {
SmallObject<>::operator delete(pCount_, sizeof(uintptr_t)); SmallObject<>::operator delete(pCount_, sizeof(uintptr_t));
pCount_ = NULL;
return true; return true;
} }
return false; return false;
@ -353,7 +354,7 @@ namespace Loki
static P Clone(const P& val) static P Clone(const P& val)
{ return val->Clone(); } { return val->Clone(); }
static bool Release(const P& val) static bool Release(const P&)
{ return true; } { return true; }
static void Swap(DeepCopy&) static void Swap(DeepCopy&)
@ -378,77 +379,11 @@ namespace Loki
RefLinkedBase() RefLinkedBase()
{ prev_ = next_ = this; } { prev_ = next_ = this; }
RefLinkedBase(const RefLinkedBase& rhs) RefLinkedBase(const RefLinkedBase& rhs);
{
prev_ = &rhs;
next_ = rhs.next_;
prev_->next_ = this;
next_->prev_ = this;
}
bool Release() bool Release();
{
if ( NULL == next_ )
{
assert( NULL == prev_ );
// Return false so it does not try to destroy shared object
// more than once.
return false;
}
else if (next_ == this)
{
assert(prev_ == this);
// Set these to NULL to prevent re-entrancy.
prev_ = NULL;
next_ = NULL;
return true;
}
assert( this != prev_ );
assert( NULL != prev_ );
prev_->next_ = next_;
next_->prev_ = prev_;
return false;
}
void Swap(RefLinkedBase& rhs) void Swap(RefLinkedBase& rhs);
{
if (next_ == this)
{
assert(prev_ == this);
if (rhs.next_ == &rhs)
{
assert(rhs.prev_ == &rhs);
// both lists are empty, nothing 2 do
return;
}
prev_ = rhs.prev_;
next_ = rhs.next_;
prev_->next_ = next_->prev_ = this;
rhs.next_ = rhs.prev_ = &rhs;
return;
}
if (rhs.next_ == &rhs)
{
rhs.Swap(*this);
return;
}
if (next_ == &rhs ) // neighbours
{
std::swap(prev_, next_);
std::swap(rhs.prev_, rhs.next_);
std::swap(rhs.prev_, next_);
std::swap(rhs.prev_->next_,next_->prev_);
}
else
{
std::swap(prev_, rhs.prev_);
std::swap(next_, rhs.next_);
std::swap(prev_->next_, rhs.prev_->next_);
std::swap(next_->prev_, rhs.next_->prev_);
}
assert( next_ == this ? prev_ == this : prev_ != this);
}
enum { destructiveCopy = false }; enum { destructiveCopy = false };
@ -890,7 +825,7 @@ namespace Loki
class ConversionPolicy, class ConversionPolicy,
template <class> class CheckingPolicy, template <class> class CheckingPolicy,
template <class> class StoragePolicy, template <class> class StoragePolicy,
template<class> class ConstnessPolicy template <class> class ConstnessPolicy
> >
class SmartPtr class SmartPtr
: public StoragePolicy<T> : public StoragePolicy<T>
@ -948,9 +883,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
SmartPtr(const SmartPtr<T1, OP1, CP1, KP1, SP1>& 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)
{ GetImplRef(*this) = OP::Clone(GetImplRef(rhs)); } { GetImplRef(*this) = OP::Clone(GetImplRef(rhs)); }
@ -960,9 +896,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
SmartPtr(SmartPtr<T1, OP1, CP1, KP1, SP1>& 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)
{ GetImplRef(*this) = OP::Clone(GetImplRef(rhs)); } { GetImplRef(*this) = OP::Clone(GetImplRef(rhs)); }
@ -986,9 +923,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
SmartPtr& operator=(const SmartPtr<T1, OP1, CP1, KP1, SP1>& rhs) SmartPtr& operator=(const SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs)
{ {
SmartPtr temp(rhs); SmartPtr temp(rhs);
temp.Swap(*this); temp.Swap(*this);
@ -1001,9 +939,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
SmartPtr& operator=(SmartPtr<T1, OP1, CP1, KP1, SP1>& rhs) SmartPtr& operator=(SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs)
{ {
SmartPtr temp(rhs); SmartPtr temp(rhs);
temp.Swap(*this); temp.Swap(*this);
@ -1070,9 +1009,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
bool operator==(const SmartPtr<T1, OP1, CP1, KP1, SP1>& rhs) const bool operator==(const SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs) const
{ return GetImpl(*this) == GetImpl(rhs); } { return GetImpl(*this) == GetImpl(rhs); }
// Ambiguity buster // Ambiguity buster
@ -1082,9 +1022,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
bool operator!=(const SmartPtr<T1, OP1, CP1, KP1, SP1>& rhs) const bool operator!=(const SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs) const
{ return !(*this == rhs); } { return !(*this == rhs); }
// Ambiguity buster // Ambiguity buster
@ -1094,9 +1035,10 @@ namespace Loki
template <class> class OP1, template <class> class OP1,
class CP1, class CP1,
template <class> class KP1, template <class> class KP1,
template <class> class SP1 template <class> class SP1,
template <class> class CNP1
> >
bool operator<(const SmartPtr<T1, OP1, CP1, KP1, SP1>& rhs) const bool operator<(const SmartPtr<T1, OP1, CP1, KP1, SP1, CNP1 >& rhs) const
{ return GetImpl(*this) < GetImpl(rhs); } { return GetImpl(*this) < GetImpl(rhs); }
private: private:
@ -1150,9 +1092,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator==(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator==(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs) U* rhs)
{ return GetImpl(lhs) == rhs; } { return GetImpl(lhs) == rhs; }
@ -1168,10 +1111,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator==(U* lhs, inline bool operator==(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs) const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs)
{ return rhs == lhs; } { return rhs == lhs; }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1186,9 +1130,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator!=(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator!=(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs) U* rhs)
{ return !(lhs == rhs); } { return !(lhs == rhs); }
@ -1204,10 +1149,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator!=(U* lhs, inline bool operator!=(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs) const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs)
{ return rhs != lhs; } { return rhs != lhs; }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1222,9 +1168,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator<(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator<(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs); U* rhs);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1239,10 +1186,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator<(U* lhs, inline bool operator<(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs); const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs);
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// operator> for lhs = SmartPtr, rhs = raw pointer -- NOT DEFINED // operator> for lhs = SmartPtr, rhs = raw pointer -- NOT DEFINED
@ -1256,9 +1204,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator>(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator>(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs) U* rhs)
{ return rhs < lhs; } { return rhs < lhs; }
@ -1274,10 +1223,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator>(U* lhs, inline bool operator>(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs) const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs)
{ return rhs < lhs; } { return rhs < lhs; }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1292,9 +1242,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator<=(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator<=(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs) U* rhs)
{ return !(rhs < lhs); } { return !(rhs < lhs); }
@ -1310,10 +1261,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator<=(U* lhs, inline bool operator<=(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs) const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs)
{ return !(rhs < lhs); } { return !(rhs < lhs); }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
@ -1328,9 +1280,10 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator>=(const SmartPtr<T, OP, CP, KP, SP>& lhs, inline bool operator>=(const SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
U* rhs) U* rhs)
{ return !(lhs < rhs); } { return !(lhs < rhs); }
@ -1346,10 +1299,11 @@ namespace Loki
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP, template <class> class SP,
template <class> class CNP1,
typename U typename U
> >
inline bool operator>=(U* lhs, inline bool operator>=(U* lhs,
const SmartPtr<T, OP, CP, KP, SP>& rhs) const SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs)
{ return !(lhs < rhs); } { return !(lhs < rhs); }
} // namespace Loki } // namespace Loki
@ -1367,14 +1321,15 @@ namespace std
template <class> class OP, template <class> class OP,
class CP, class CP,
template <class> class KP, template <class> class KP,
template <class> class SP template <class> class SP,
template <class> class CNP1
> >
struct less< Loki::SmartPtr<T, OP, CP, KP, SP> > struct less< Loki::SmartPtr<T, OP, CP, KP, SP, CNP1 > >
: public binary_function<Loki::SmartPtr<T, OP, CP, KP, SP>, : public binary_function<Loki::SmartPtr<T, OP, CP, KP, SP, CNP1 >,
Loki::SmartPtr<T, OP, CP, KP, SP>, bool> Loki::SmartPtr<T, OP, CP, KP, SP, CNP1 >, bool>
{ {
bool operator()(const Loki::SmartPtr<T, OP, CP, KP, SP>& lhs, bool operator()(const Loki::SmartPtr<T, OP, CP, KP, SP, CNP1 >& lhs,
const Loki::SmartPtr<T, OP, CP, KP, SP>& rhs) const const Loki::SmartPtr<T, OP, CP, KP, SP, CNP1 >& rhs) const
{ return less<T*>()(GetImpl(lhs), GetImpl(rhs)); } { return less<T*>()(GetImpl(lhs), GetImpl(rhs)); }
}; };
} }
@ -1398,6 +1353,9 @@ namespace std
#endif // SMARTPTR_INC_ #endif // SMARTPTR_INC_
// $Log$ // $Log$
// Revision 1.18 2006/02/25 01:52:17 rich_sposato
// Moved a monolithic base class from header file to new source file.
//
// Revision 1.17 2006/02/19 22:04:28 rich_sposato // Revision 1.17 2006/02/19 22:04:28 rich_sposato
// Moved Const-policy structs from SmartPtr.h to ConstPolicy.h. // Moved Const-policy structs from SmartPtr.h to ConstPolicy.h.
// //

4
src/Library.vcproj
View file

@ -311,6 +311,10 @@
RelativePath=".\SmallObj.cpp" RelativePath=".\SmallObj.cpp"
> >
</File> </File>
<File
RelativePath=".\SmartPtr.cpp"
>
</File>
</Filter> </Filter>
</Files> </Files>
<Globals> <Globals>

123
src/SmartPtr.cpp Normal file
View file

@ -0,0 +1,123 @@
////////////////////////////////////////////////////////////////////////////////
// The Loki Library
// Copyright (c) 2001 by Andrei Alexandrescu
// Copyright (c) 2006 Richard Sposato
// This code accompanies the book:
// Alexandrescu, Andrei. "Modern C++ Design: Generic Programming and Design
// Patterns Applied". Copyright (c) 2001. Addison-Wesley.
// Permission to use, copy, modify, distribute and sell this software for any
// purpose is hereby granted without fee, provided that the above copyright
// notice appear in all copies and that both that copyright notice and this
// permission notice appear in supporting documentation.
// The author or Addison-Wesley Longman make no representations about the
// suitability of this software for any purpose. It is provided "as is"
// without express or implied warranty.
////////////////////////////////////////////////////////////////////////////////
// $Header$
#include <loki/SmartPtr.h>
#include <cassert>
// ----------------------------------------------------------------------------
namespace Loki
{
namespace Private
{
// ----------------------------------------------------------------------------
RefLinkedBase::RefLinkedBase(const RefLinkedBase& rhs)
{
prev_ = &rhs;
next_ = rhs.next_;
prev_->next_ = this;
next_->prev_ = this;
}
// ----------------------------------------------------------------------------
bool RefLinkedBase::Release()
{
if ( NULL == next_ )
{
assert( NULL == prev_ );
// Return false so it does not try to destroy shared object
// more than once.
return false;
}
else if (next_ == this)
{
assert(prev_ == this);
// Set these to NULL to prevent re-entrancy.
prev_ = NULL;
next_ = NULL;
return true;
}
assert( this != prev_ );
assert( NULL != prev_ );
prev_->next_ = next_;
next_->prev_ = prev_;
return false;
}
// ----------------------------------------------------------------------------
void RefLinkedBase::Swap(RefLinkedBase& rhs)
{
if (next_ == this)
{
assert(prev_ == this);
if (rhs.next_ == &rhs)
{
assert(rhs.prev_ == &rhs);
// both lists are empty, nothing 2 do
return;
}
prev_ = rhs.prev_;
next_ = rhs.next_;
prev_->next_ = next_->prev_ = this;
rhs.next_ = rhs.prev_ = &rhs;
return;
}
if (rhs.next_ == &rhs)
{
rhs.Swap(*this);
return;
}
if (next_ == &rhs ) // neighbours
{
if ( prev_ == &rhs )
return; // cycle of 2 pointers - no need to swap.
std::swap(prev_, next_);
std::swap(rhs.prev_, rhs.next_);
std::swap(rhs.prev_, next_);
std::swap(rhs.prev_->next_,next_->prev_);
}
else
{
std::swap(prev_, rhs.prev_);
std::swap(next_, rhs.next_);
std::swap(prev_->next_, rhs.prev_->next_);
std::swap(next_->prev_, rhs.next_->prev_);
}
assert( next_ == this ? prev_ == this : prev_ != this);
}
// ----------------------------------------------------------------------------
}; // end namespace Private
}; // end namespace Loki
// ----------------------------------------------------------------------------
// $Log$
// Revision 1.1 2006/02/25 01:52:17 rich_sposato
// Moved a monolithic base class from header file to new source file.
//