aboutsummaryrefslogtreecommitdiff
path: root/zencore/include
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2021-09-15 21:33:57 +0200
committerStefan Boberg <[email protected]>2021-09-15 21:33:57 +0200
commit574c4dde8e047bc6aec9324c0942021900678a53 (patch)
tree397998d7e70041b418eb28c62bec4979f2d90d09 /zencore/include
parentAdded some more trace-level logging (diff)
parentMerge branch 'main' into cbpackage-update (diff)
downloadzen-574c4dde8e047bc6aec9324c0942021900678a53.tar.xz
zen-574c4dde8e047bc6aec9324c0942021900678a53.zip
Merge branch 'main' of https://github.com/EpicGames/zen
Diffstat (limited to 'zencore/include')
-rw-r--r--zencore/include/zencore/iobuffer.h2
-rw-r--r--zencore/include/zencore/stream.h4
2 files changed, 6 insertions, 0 deletions
diff --git a/zencore/include/zencore/iobuffer.h b/zencore/include/zencore/iobuffer.h
index 034c3566f..28772e219 100644
--- a/zencore/include/zencore/iobuffer.h
+++ b/zencore/include/zencore/iobuffer.h
@@ -321,7 +321,9 @@ public:
[[nodiscard]] void* MutableData() const { return m_Core->MutableDataPointer(); }
void MakeImmutable() { m_Core->SetIsImmutable(true); }
[[nodiscard]] const void* Data() const { return m_Core->DataPointer(); }
+ [[nodiscard]] const void* GetData() const { return m_Core->DataPointer(); }
[[nodiscard]] size_t Size() const { return m_Core->DataBytes(); }
+ [[nodiscard]] size_t GetSize() const { return m_Core->DataBytes(); }
inline void SetContentType(ZenContentType ContentType) { m_Core->SetContentType(ContentType); }
[[nodiscard]] inline ZenContentType GetContentType() const { return m_Core->GetContentType(); }
[[nodiscard]] ZENCORE_API bool GetFileReference(IoBufferFileReference& OutRef) const;
diff --git a/zencore/include/zencore/stream.h b/zencore/include/zencore/stream.h
index 4e8c58382..a0e165bdc 100644
--- a/zencore/include/zencore/stream.h
+++ b/zencore/include/zencore/stream.h
@@ -36,6 +36,7 @@ class InStream : public RefCounted
public:
virtual void Read(void* DataPtr, size_t ByteCount, uint64_t Offset) = 0;
virtual uint64_t Size() const = 0;
+ uint64_t GetSize() const { return Size(); }
};
/**
@@ -50,7 +51,9 @@ public:
virtual void Write(const void* DataPtr, size_t ByteCount, uint64_t Offset) override;
virtual void Flush() override;
inline const uint8_t* Data() const { return m_Buffer.data(); }
+ inline const uint8_t* GetData() const { return m_Buffer.data(); }
inline uint64_t Size() const { return m_Buffer.size(); }
+ inline uint64_t GetSize() const { return m_Buffer.size(); }
private:
RwLock m_Lock;
@@ -76,6 +79,7 @@ public:
virtual void Read(void* DataPtr, size_t ByteCount, uint64_t ReadOffset) override;
virtual uint64_t Size() const override { return m_Buffer.size(); }
inline const uint8_t* Data() const { return m_Buffer.data(); }
+ inline const uint8_t* GetData() const { return m_Buffer.data(); }
private:
RwLock m_Lock;