aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorFilippos Karapetis2016-06-23 21:17:16 +0300
committerFilippos Karapetis2016-06-23 21:17:16 +0300
commit17983508b37b3a00ca930c1bc2cf043475b51471 (patch)
treee012162077311d9e57a7aecdcdb7768b37927a9e /engines
parente80f1bb115b919c95ef9efaaf089c0da3e42c33c (diff)
downloadscummvm-rg350-17983508b37b3a00ca930c1bc2cf043475b51471.tar.gz
scummvm-rg350-17983508b37b3a00ca930c1bc2cf043475b51471.tar.bz2
scummvm-rg350-17983508b37b3a00ca930c1bc2cf043475b51471.zip
SCI32: Fix usage of the C++11 override keyword with MSVC
MSVC does not allow the usage of the "override" keyword on function definition, only on declaration
Diffstat (limited to 'engines')
-rw-r--r--engines/sci/sound/decoders/sol.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/engines/sci/sound/decoders/sol.cpp b/engines/sci/sound/decoders/sol.cpp
index a899cc4c77..e445403120 100644
--- a/engines/sci/sound/decoders/sol.cpp
+++ b/engines/sci/sound/decoders/sol.cpp
@@ -118,7 +118,7 @@ SOLStream<STEREO, S16BIT>::SOLStream(Common::SeekableReadStream *stream, const D
}
template <bool STEREO, bool S16BIT>
-bool SOLStream<STEREO, S16BIT>::seek(const Audio::Timestamp &where) override {
+bool SOLStream<STEREO, S16BIT>::seek(const Audio::Timestamp &where) {
if (where != 0) {
// In order to seek in compressed SOL files, all
// previous bytes must be known since it uses
@@ -138,12 +138,12 @@ bool SOLStream<STEREO, S16BIT>::seek(const Audio::Timestamp &where) override {
}
template <bool STEREO, bool S16BIT>
-Audio::Timestamp SOLStream<STEREO, S16BIT>::getLength() const override {
+Audio::Timestamp SOLStream<STEREO, S16BIT>::getLength() const {
return _length;
}
template <bool STEREO, bool S16BIT>
-int SOLStream<STEREO, S16BIT>::readBuffer(int16 *buffer, const int numSamples) override {
+int SOLStream<STEREO, S16BIT>::readBuffer(int16 *buffer, const int numSamples) {
// Reading an odd number of 8-bit samples will result in a loss of samples
// since one byte represents two samples and we do not store the second
// nibble in this case; it should never happen in reality
@@ -167,22 +167,22 @@ int SOLStream<STEREO, S16BIT>::readBuffer(int16 *buffer, const int numSamples) o
}
template <bool STEREO, bool S16BIT>
-bool SOLStream<STEREO, S16BIT>::isStereo() const override {
+bool SOLStream<STEREO, S16BIT>::isStereo() const {
return STEREO;
}
template <bool STEREO, bool S16BIT>
-int SOLStream<STEREO, S16BIT>::getRate() const override {
+int SOLStream<STEREO, S16BIT>::getRate() const {
return _sampleRate;
}
template <bool STEREO, bool S16BIT>
-bool SOLStream<STEREO, S16BIT>::endOfData() const override {
+bool SOLStream<STEREO, S16BIT>::endOfData() const {
return _stream->eos() || _stream->pos() >= _dataOffset + _rawDataSize;
}
template <bool STEREO, bool S16BIT>
-bool SOLStream<STEREO, S16BIT>::rewind() override {
+bool SOLStream<STEREO, S16BIT>::rewind() {
return seek(0);
}