diff options
| author | Johannes Schickel | 2011-12-26 21:01:34 +0100 |
|---|---|---|
| committer | Johannes Schickel | 2011-12-26 21:03:51 +0100 |
| commit | 0117fc415e9c35e9a721c2b4118f106ba9e56b57 (patch) | |
| tree | 219b94744b859c5acce9a92483dccf15bd0bb47d /engines/scumm | |
| parent | b5ad84a05d7ad56118794efe071fe20c35ef4821 (diff) | |
| download | scummvm-rg350-0117fc415e9c35e9a721c2b4118f106ba9e56b57.tar.gz scummvm-rg350-0117fc415e9c35e9a721c2b4118f106ba9e56b57.tar.bz2 scummvm-rg350-0117fc415e9c35e9a721c2b4118f106ba9e56b57.zip | |
SCUMM: Make SampleBuffer::write non-virtual to silence a g++ warning.
No class inherits from SampleBuffer, thus it should be safe to do so.
Diffstat (limited to 'engines/scumm')
| -rw-r--r-- | engines/scumm/player_apple2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h index 9e97ab0c89..d9345a7113 100644 --- a/engines/scumm/player_apple2.h +++ b/engines/scumm/player_apple2.h @@ -103,7 +103,7 @@ public: return _writePos - _readPos; } - virtual uint32 write(const void *dataPtr, uint32 dataSize) { + uint32 write(const void *dataPtr, uint32 dataSize) { ensureFree(dataSize); memcpy(_data + _writePos, dataPtr, dataSize); _writePos += dataSize; |