[Scummvm-git-logs] scummvm master -> 89396097875322b405a7e8e087d7a22766d4eca5

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
8939609787 COMMON: Make MemoryReadStreamEndian inherit from SeekableReadStreamEndian


Commit: 89396097875322b405a7e8e087d7a22766d4eca5
    https://github.com/scummvm/scummvm/commit/89396097875322b405a7e8e087d7a22766d4eca5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-07-21T12:46:22+02:00

Commit Message:
COMMON: Make MemoryReadStreamEndian inherit from SeekableReadStreamEndian

Changed paths:
    common/memstream.h


diff --git a/common/memstream.h b/common/memstream.h
index 187b562b2f..4bbcc2b401 100644
--- a/common/memstream.h
+++ b/common/memstream.h
@@ -78,10 +78,17 @@ public:
  * This is a MemoryReadStream subclass which adds non-endian
  * read methods whose endianness is set on the stream creation.
  */
-class MemoryReadStreamEndian : public MemoryReadStream, public ReadStreamEndian {
+class MemoryReadStreamEndian : public MemoryReadStream, public SeekableReadStreamEndian {
 public:
 	MemoryReadStreamEndian(const byte *buf, uint32 len, bool bigEndian)
-		: MemoryReadStream(buf, len), ReadStreamEndian(bigEndian) {}
+		: MemoryReadStream(buf, len), SeekableReadStreamEndian(bigEndian) {}
+
+	int32 pos() const { return MemoryReadStream::pos(); }
+	int32 size() const { return MemoryReadStream::size(); }
+
+	bool seek(int32 offs, int whence = SEEK_SET) { return MemoryReadStream::seek(offs, whence); }
+
+	bool skip(uint32 offset) { return MemoryReadStream::seek(offset, SEEK_CUR); }
 };
 
 /**