[Scummvm-git-logs] scummvm master -> 771ba72d24b9514ee2c204e223b1a89a9cbb191f

[sev-]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
44e21a499d AUDIO: Added override keywords
771ba72d24 CONFIGURE: Remove -O2 flag from --enable-tsan


Commit: 44e21a499d76bbc0ef48d153f44447b577012353
    https://github.com/scummvm/scummvm/commit/44e21a499d76bbc0ef48d153f44447b577012353
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-19T12:34:58+02:00

Commit Message:
AUDIO: Added override keywords

Changed paths:
    audio/softsynth/fmtowns_pc98/sega_audio.cpp


diff --git a/audio/softsynth/fmtowns_pc98/sega_audio.cpp b/audio/softsynth/fmtowns_pc98/sega_audio.cpp
index 5baaf6d3d4..798a2b84a9 100644
--- a/audio/softsynth/fmtowns_pc98/sega_audio.cpp
+++ b/audio/softsynth/fmtowns_pc98/sega_audio.cpp
@@ -89,7 +89,7 @@ public:
 	static SegaAudioInterfaceInternal *addNewRef(Audio::Mixer *mixer, SegaAudioInterface *owner, SegaAudioPluginDriver *driver);
 	static void releaseRef(SegaAudioInterface *owner);
 
-	bool init();
+	bool init() override;
 
 	void loadPCMData(uint16 address, const uint8 *data, uint16 dataLen);
 	void playPCMChannel(uint8 channel, uint8 dataStart, uint16 loopStart, uint16 pitch, uint8 pan, uint8 vol);
@@ -112,8 +112,8 @@ private:
 
 	void nextTickEx(int32 *buffer, uint32 bufferSize) override;
 
-	void timerCallbackA();
-	void timerCallbackB();
+	void timerCallbackA() override;
+	void timerCallbackB() override;
 
 	uint16 pcmCountSamples(uint16 address) const;
 
@@ -201,13 +201,13 @@ bool SegaAudioInterfaceInternal::init() {
 	}
 
 	reset();
-	
+
 	writeReg(0, 0x26, 0xC6);
 	writeReg(0, 0x25, 0x62);
-	writeReg(0, 0x24, 0x00);	
+	writeReg(0, 0x24, 0x00);
 	writeReg(0, 0x27, 0x30);
 
-	// Declare FM channels as music channels and PCM channels as sound effect channels. 
+	// Declare FM channels as music channels and PCM channels as sound effect channels.
 	setSoundEffectChanMask(~0x1FF);
 
 	_ready = true;


Commit: 771ba72d24b9514ee2c204e223b1a89a9cbb191f
    https://github.com/scummvm/scummvm/commit/771ba72d24b9514ee2c204e223b1a89a9cbb191f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-08-19T12:34:58+02:00

Commit Message:
CONFIGURE: Remove -O2 flag from --enable-tsan

Changed paths:
    configure


diff --git a/configure b/configure
index 79fa717843..9766a129ff 100755
--- a/configure
+++ b/configure
@@ -5612,8 +5612,8 @@ echo "$_enable_asan"
 echo_n "Enabling Thread Sanitizer... "
 
 if test "$_enable_tsan" = yes ; then
-	append_var CXXFLAGS "-fsanitize=thread -O2"
-	append_var LDFLAGS "-fsanitize=thread -O2"
+	append_var CXXFLAGS "-fsanitize=thread"
+	append_var LDFLAGS "-fsanitize=thread"
 fi
 echo "$_enable_tsan"