diff options
Diffstat (limited to 'lib/common/MemBlockStream.h')
-rw-r--r-- | lib/common/MemBlockStream.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/lib/common/MemBlockStream.h b/lib/common/MemBlockStream.h index ed0bf4ff..5234525b 100644 --- a/lib/common/MemBlockStream.h +++ b/lib/common/MemBlockStream.h @@ -27,10 +27,7 @@ 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); @@ -45,11 +42,8 @@ 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; |