thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Mark methods as override

Browse source
This commit is contained in:
Eugene Sandulenko 2020-01-31 12:26:10 +01:00
parent d804afbe70
commit 507dd5c178
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
common/file.h
View file

@ -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;

6
common/memstream.h
View file

@ -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);