From 507dd5c178415814030473550680ec2a9a8e30fc Mon Sep 17 00:00:00 2001 From: Eugene Sandulenko Date: Fri, 31 Jan 2020 12:26:10 +0100 Subject: [PATCH] COMMON: Mark methods as override --- common/file.h | 18 +++++++++--------- common/memstream.h | 6 +++--- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/common/file.h b/common/file.h index ea7619b0c4d..2d5232abccf 100644 --- a/common/file.h +++ b/common/file.h @@ -117,14 +117,14 @@ public: */ const char *getName() const { return _name.c_str(); } - bool err() const; // implement abstract Stream method - void clearErr(); // implement abstract Stream method - bool eos() const; // implement abstract SeekableReadStream method + bool err() const override; // implement abstract Stream method + void clearErr() override; // implement abstract Stream method + bool eos() const override; // implement abstract SeekableReadStream method - int32 pos() const; // implement abstract SeekableReadStream method - int32 size() const; // implement abstract SeekableReadStream method - bool seek(int32 offs, int whence = SEEK_SET); // implement abstract SeekableReadStream method - uint32 read(void *dataPtr, uint32 dataSize); // implement abstract SeekableReadStream method + int32 pos() const override; // implement abstract SeekableReadStream method + int32 size() const override; // implement abstract SeekableReadStream method + bool seek(int32 offs, int whence = SEEK_SET) override; // implement abstract SeekableReadStream method + uint32 read(void *dataPtr, uint32 dataSize) override; // implement abstract SeekableReadStream method }; @@ -155,8 +155,8 @@ public: */ bool isOpen() const; - bool err() const; - void clearErr(); + bool err() const override; + void clearErr() override; virtual uint32 write(const void *dataPtr, uint32 dataSize) override; diff --git a/common/memstream.h b/common/memstream.h index 68cfdce97c8..187b562b2ff 100644 --- a/common/memstream.h +++ b/common/memstream.h @@ -98,7 +98,7 @@ protected: public: MemoryWriteStream(byte *buf, uint32 len) : _ptr(buf), _bufSize(len), _pos(0), _err(false) {} - uint32 write(const void *dataPtr, uint32 dataSize) { + uint32 write(const void *dataPtr, uint32 dataSize) override { // Write at most as many bytes as are still available... if (dataSize > _bufSize - _pos) { dataSize = _bufSize - _pos; @@ -197,7 +197,7 @@ public: free(_data); } - uint32 write(const void *dataPtr, uint32 dataSize) { + uint32 write(const void *dataPtr, uint32 dataSize) override { ensureCapacity(_pos + dataSize); memcpy(_ptr, dataPtr, dataSize); _ptr += dataSize; @@ -283,7 +283,7 @@ public: free(_data); } - uint32 write(const void *dataPtr, uint32 dataSize) { + uint32 write(const void *dataPtr, uint32 dataSize) override { ensureCapacity(_length + dataSize); if (_writePos + dataSize < _capacity) { memcpy(_data + _writePos, dataPtr, dataSize);