Skip to content

Commit f720714

Browse files
committed
CMemoryView: make CMemory as public
1 parent 4153663 commit f720714

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

include/dynlibutils/memaddr.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@ class CMemory
227227
}; // class CMemory
228228

229229
template<typename T>
230-
class CMemoryView : protected CMemory
230+
class CMemoryView : public CMemory
231231
{
232232
public:
233233
using CBase = CMemory;
@@ -249,9 +249,9 @@ class CMemoryView : protected CMemory
249249
using CMemory::IsValid;
250250

251251
/// Cast methods (view ones).
252-
constexpr T* CCast() const noexcept { return CBase::CCast<T*>(); }
253-
constexpr T* RCast() const noexcept { return CBase::RCast<T*>(); }
254-
constexpr T* UCast() const noexcept { CBase::UCast<T*>(); }
252+
constexpr T* CCastView() const noexcept { return CBase::CCast<T*>(); }
253+
constexpr T* RCastView() const noexcept { return CBase::RCast<T*>(); }
254+
constexpr T* UCastView() const noexcept { return CBase::UCast<T*>(); }
255255

256256
/// Access methods (view ones).
257257
constexpr T* GetPtr() const noexcept { return CBase::RCast<T*>(); }
@@ -260,7 +260,7 @@ class CMemoryView : protected CMemory
260260
constexpr T Get() const { return GetRef(); }
261261

262262
/// Offset methods (view ones; operators are used).
263-
CThis Offset(std::ptrdiff_t offset) const noexcept { return reinterpret_cast<CThis>(reinterpret_cast<T *>(CBase::m_addr) + offset); }
263+
CThis Offset(std::ptrdiff_t offset) const noexcept { return CThis(reinterpret_cast<T *>(CBase::m_addr) + offset); }
264264
CThis& OffsetSelf(std::ptrdiff_t offset) noexcept { reinterpret_cast<T *>(CBase::m_addr) += offset; return *this; }
265265
}; // class CMemoryView
266266

0 commit comments

Comments
 (0)