diff options
author | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
---|---|---|
committer | Reinhard Tartler <siretart@tauware.de> | 2017-06-11 21:52:33 -0400 |
commit | e0eb815b67734abd09ff41e2271630d4b2a6d760 (patch) | |
tree | 0df971c34f98d2a1dfd0921524a17d561a4a6536 /lib/common/MemBlockStream.h | |
parent | 676c9e1c9d4ac8eb8a440d7f11c4ac44f98f4a6a (diff) | |
parent | e19a5db232e1ef90e9a02159d2fbd9707ffe4373 (diff) |
merge upstream version 0.12
Diffstat (limited to 'lib/common/MemBlockStream.h')
-rw-r--r-- | lib/common/MemBlockStream.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/lib/common/MemBlockStream.h b/lib/common/MemBlockStream.h index f78ff8e6..ed0bf4ff 100644 --- a/lib/common/MemBlockStream.h +++ b/lib/common/MemBlockStream.h @@ -27,6 +27,10 @@ class CollectInBufferStream; class MemBlockStream : public IOStream { public: +<<<<<<< HEAD +======= + MemBlockStream(); +>>>>>>> 0.12 MemBlockStream(const void *pBuffer, int Size); MemBlockStream(const StreamableMemBlock &rBlock); MemBlockStream(const CollectInBufferStream &rBuffer); @@ -41,6 +45,11 @@ public: virtual void Seek(pos_type Offset, int SeekType); virtual bool StreamDataLeft(); virtual bool StreamClosed(); +<<<<<<< HEAD +======= + virtual const void* GetBuffer() const { return mpBuffer; } + virtual int GetSize() const { return mBytesInBuffer; } +>>>>>>> 0.12 private: const char *mpBuffer; |