diff options
| author | Martin Ridgers <[email protected]> | 2021-09-15 10:17:28 +0200 |
|---|---|---|
| committer | Martin Ridgers <[email protected]> | 2021-09-15 10:17:28 +0200 |
| commit | 18c421fb443ba6b4443c98f8ca57304cbe62bf9b (patch) | |
| tree | 6a7db5d54434d18584629f00d82138558a7fcda8 /zencore/include | |
| parent | Merge main (diff) | |
| download | zen-18c421fb443ba6b4443c98f8ca57304cbe62bf9b.tar.xz zen-18c421fb443ba6b4443c98f8ca57304cbe62bf9b.zip | |
Fixed GetSize() constexpr compile errors with GCC
Diffstat (limited to 'zencore/include')
| -rw-r--r-- | zencore/include/zencore/memory.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/zencore/include/zencore/memory.h b/zencore/include/zencore/memory.h index 3cec0eb88..1f948d3bb 100644 --- a/zencore/include/zencore/memory.h +++ b/zencore/include/zencore/memory.h @@ -83,10 +83,10 @@ struct MutableMemoryView { } - inline bool IsEmpty() const { return m_Data == m_DataEnd; } - void* GetData() const { return m_Data; } - void* GetDataEnd() const { return m_DataEnd; } - size_t GetSize() const { return reinterpret_cast<uint8_t*>(m_DataEnd) - reinterpret_cast<uint8_t*>(m_Data); } + inline bool IsEmpty() const { return m_Data == m_DataEnd; } + void* GetData() const { return m_Data; } + void* GetDataEnd() const { return m_DataEnd; } + constexpr size_t GetSize() const { return reinterpret_cast<uint8_t*>(m_DataEnd) - reinterpret_cast<uint8_t*>(m_Data); } inline bool EqualBytes(const MutableMemoryView& InView) const { @@ -194,11 +194,11 @@ struct MemoryView { } - inline bool Contains(const MemoryView& Other) const { return (m_Data <= Other.m_Data) && (m_DataEnd >= Other.m_DataEnd); } - inline bool IsEmpty() const { return m_Data == m_DataEnd; } - const void* GetData() const { return m_Data; } - const void* GetDataEnd() const { return m_DataEnd; } - size_t GetSize() const { return reinterpret_cast<const uint8_t*>(m_DataEnd) - reinterpret_cast<const uint8_t*>(m_Data); } + inline bool Contains(const MemoryView& Other) const { return (m_Data <= Other.m_Data) && (m_DataEnd >= Other.m_DataEnd); } + inline bool IsEmpty() const { return m_Data == m_DataEnd; } + const void* GetData() const { return m_Data; } + const void* GetDataEnd() const { return m_DataEnd; } + constexpr size_t GetSize() const { return reinterpret_cast<const uint8_t*>(m_DataEnd) - reinterpret_cast<const uint8_t*>(m_Data); } inline bool operator==(const MemoryView& Rhs) const { return m_Data == Rhs.m_Data && m_DataEnd == Rhs.m_DataEnd; } inline bool EqualBytes(const MemoryView& InView) const |