Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[ATL] Rename CHeapPtr data member, since it is public

Browse source
This commit is contained in:
Mark Jansen 2020-01-11 14:38:08 +01:00
parent 55032c3122
commit 45d33582e7
No known key found for this signature in database
GPG key ID: B39240EE84BEAE8B
1 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
sdk/lib/atl/atlalloc.h
View file

@ -98,18 +98,18 @@ class CHeapPtr
{
public:
CHeapPtr() :
m_Data(NULL)
m_pData(NULL)
{
}
explicit CHeapPtr(T *lp) :
m_Data(lp)
m_pData(lp)
{
}
explicit CHeapPtr(CHeapPtr<T, Allocator> &lp)
{
m_Data = lp.Detach();
m_pData = lp.Detach();
}
~CHeapPtr()
@ -119,24 +119,24 @@ public:
CHeapPtr<T, Allocator>& operator = (CHeapPtr<T, Allocator> &lp)
{
if (lp.m_Data != m_Data)
if (lp.m_pData != m_pData)
Attach(lp.Detach());
return *this;
}
bool AllocateBytes(_In_ size_t nBytes)
{
ATLASSERT(m_Data == NULL);
m_Data = static_cast<T*>(Allocator::Allocate(nBytes));
return m_Data != NULL;
ATLASSERT(m_pData == NULL);
m_pData = static_cast<T*>(Allocator::Allocate(nBytes));
return m_pData != NULL;
}
bool ReallocateBytes(_In_ size_t nBytes)
{
T* newData = static_cast<T*>(Allocator::Reallocate(m_Data, nBytes));
T* newData = static_cast<T*>(Allocator::Reallocate(m_pData, nBytes));
if (newData == NULL)
return false;
m_Data = newData;
m_pData = newData;
return true;
}
@ -152,43 +152,43 @@ public:
void Free()
{
if (m_Data)
if (m_pData)
{
Allocator::Free(m_Data);
m_Data = NULL;
Allocator::Free(m_pData);
m_pData = NULL;
}
}
void Attach(T *lp)
{
Allocator::Free(m_Data);
m_Data = lp;
Allocator::Free(m_pData);
m_pData = lp;
}
T *Detach()
{
T *saveP = m_Data;
m_Data = NULL;
T *saveP = m_pData;
m_pData = NULL;
return saveP;
}
T **operator &()
{
ATLASSERT(m_Data == NULL);
return &m_Data;
ATLASSERT(m_pData == NULL);
return &m_pData;
}
operator T* () const
{
return m_Data;
return m_pData;
}
T* operator->() const
{
return m_Data;
return m_pData;
}
protected:
T *m_Data;
public:
T *m_pData;
};