[Scummvm-cvs-logs] scummvm master -> 0117fc415e9c35e9a721c2b4118f106ba9e56b57

lordhoto lordhoto at gmail.com
Mon Dec 26 21:04:28 CET 2011


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:
0117fc415e SCUMM: Make SampleBuffer::write non-virtual to silence a g++ warning.


Commit: 0117fc415e9c35e9a721c2b4118f106ba9e56b57
    https://github.com/scummvm/scummvm/commit/0117fc415e9c35e9a721c2b4118f106ba9e56b57
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-12-26T12:03:51-08:00

Commit Message:
SCUMM: Make SampleBuffer::write non-virtual to silence a g++ warning.

No class inherits from SampleBuffer, thus it should be safe to do so.

Changed paths:
    engines/scumm/player_apple2.h



diff --git a/engines/scumm/player_apple2.h b/engines/scumm/player_apple2.h
index 9e97ab0..d9345a7 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;






More information about the Scummvm-git-logs mailing list