generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-10-26 18:42:41 +01:00
Code Issues Projects Releases Wiki Activity

merge some changes from develop branch; modernize and clean-up code; remove support for compiling without POCO_WIN32_UTF8

Browse Source
This commit is contained in:
Günter Obiltschnig
2020-01-09 10:08:09 +01:00
parent 7c177b6f89
commit 1bf40a0cd2
389 changed files with 3029 additions and 4111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
Foundation/include/Poco/SharedPtr.h
View File

@@ -63,7 +63,7 @@ class ReleasePolicy
public:
static void release(C* pObj)
/// Delete the object.
/// Note that pObj can be 0.
/// Note that pObj can be nullptr.
{
delete pObj;
}
@@ -77,14 +77,14 @@ class ReleaseArrayPolicy
public:
static void release(C* pObj)
/// Delete the object.
/// Note that pObj can be 0.
/// Note that pObj can be nullptr.
{
delete [] pObj;
}
};
template <class C, class RC = ReferenceCounter, class RP = ReleasePolicy<C> >
template <class C, class RC = ReferenceCounter, class RP = ReleasePolicy<C>>
class SharedPtr
/// SharedPtr is a "smart" pointer for classes implementing
/// reference counting based garbage collection.
@@ -115,13 +115,13 @@ class SharedPtr
public:
typedef C Type;
SharedPtr(): _pCounter(new RC), _ptr(0)
SharedPtr(): _pCounter(nullptr), _ptr(nullptr)
{
}
SharedPtr(C* ptr)
try:
_pCounter(new RC),
_pCounter(ptr ? new RC : nullptr),
_ptr(ptr)
{
}
@@ -133,12 +133,18 @@ public:
template <class Other, class OtherRP>
SharedPtr(const SharedPtr<Other, RC, OtherRP>& ptr): _pCounter(ptr._pCounter), _ptr(const_cast<Other*>(ptr.get()))
{
_pCounter->duplicate();
if (_pCounter) _pCounter->duplicate();
}
SharedPtr(const SharedPtr& ptr): _pCounter(ptr._pCounter), _ptr(ptr._ptr)
{
_pCounter->duplicate();
if (_pCounter) _pCounter->duplicate();
}
SharedPtr(SharedPtr&& ptr) noexcept: _pCounter(std::move(ptr._pCounter)), _ptr(std::move(ptr._ptr))
{
ptr._pCounter = nullptr;
ptr._ptr = nullptr;
}
~SharedPtr()
@@ -186,7 +192,7 @@ public:
void reset()
{
assign(0);
assign(nullptr);
}
void reset(C* ptr)
@@ -215,6 +221,15 @@ public:
return assign(ptr);
}
SharedPtr& operator = (SharedPtr&& ptr) noexcept
{
_ptr = std::move(ptr._ptr);
_pCounter = std::move(ptr._pCounter);
ptr._ptr = nullptr;
ptr._pCounter = nullptr;
return *this;
}
template <class Other, class OtherRP>
SharedPtr& operator = (const SharedPtr<Other, RC, OtherRP>& ptr)
{
@@ -296,12 +311,12 @@ public:
bool operator ! () const
{
return _ptr == 0;
return _ptr == nullptr;
}
bool isNull() const
{
return _ptr == 0;
return _ptr == nullptr;
}
bool operator == (const SharedPtr& ptr) const
@@ -396,7 +411,7 @@ public:
int referenceCount() const
{
return _pCounter->referenceCount();
return _pCounter ? _pCounter->referenceCount() : 0;
}
private:
@@ -410,15 +425,13 @@ private:
void release()
{
poco_assert_dbg (_pCounter);
int i = _pCounter->release();
if (i == 0)
if (_pCounter && _pCounter->release() == 0)
{
RP::release(_ptr);
_ptr = 0;
_ptr = nullptr;
delete _pCounter;
_pCounter = 0;
_pCounter = nullptr;
}
}
@@ -444,6 +457,20 @@ inline void swap(SharedPtr<C, RC, RP>& p1, SharedPtr<C, RC, RP>& p2)
}
template <typename T, typename... Args>
SharedPtr<T> makeShared(Args&&... args)
{
return SharedPtr<T>(new T(std::forward<Args>(args)...));
}
template <typename T>
SharedPtr<T, ReferenceCounter, ReleaseArrayPolicy<T>> makeSharedArray(std::size_t size)
{
return new SharedPtr<T, ReferenceCounter, ReleaseArrayPolicy<T>>(new T[size]);
}
} // namespace Poco