[Scummvm-cvs-logs] scummvm master -> 6f8075833f6b3a6a351e7571f8df06d682fdd722

[sev-]

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:
6f8075833f WINTERMUTE: Another fix for c++11 compilation


Commit: 6f8075833f6b3a6a351e7571f8df06d682fdd722
    https://github.com/scummvm/scummvm/commit/6f8075833f6b3a6a351e7571f8df06d682fdd722
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2016-07-24T23:15:44+03:00

Commit Message:
WINTERMUTE: Another fix for c++11 compilation

Changed paths:
    engines/wintermute/debugger/debugger_controller.cpp
    engines/wintermute/debugger/debugger_controller.h



diff --git a/engines/wintermute/debugger/debugger_controller.cpp b/engines/wintermute/debugger/debugger_controller.cpp
index 2e02153..aef96ed 100644
--- a/engines/wintermute/debugger/debugger_controller.cpp
+++ b/engines/wintermute/debugger/debugger_controller.cpp
@@ -147,7 +147,7 @@ void DebuggerController::onBreakpoint(const Breakpoint *breakpoint, DebuggableSc
 	DEBUGGER->notifyBreakpoint(script->dbgGetFilename().c_str(), script->_currentLine);
 }
 
-void DebuggerController::notifyStep(DebuggableScript *script) override {
+void DebuggerController::notifyStep(DebuggableScript *script) {
 	_lastScript = script;
 	_lastLine = script->_currentLine;
 	DEBUGGER->notifyStep(script->dbgGetFilename().c_str(), script->_currentLine);
diff --git a/engines/wintermute/debugger/debugger_controller.h b/engines/wintermute/debugger/debugger_controller.h
index 8c72028..345b42f 100644
--- a/engines/wintermute/debugger/debugger_controller.h
+++ b/engines/wintermute/debugger/debugger_controller.h
@@ -112,7 +112,7 @@ public:
 	 */
 	void onBreakpoint(const Breakpoint *breakpoint, DebuggableScript *script);
 	void onWatch(const Watch *watch, DebuggableScript *script);
-	void notifyStep(DebuggableScript *script);
+	void notifyStep(DebuggableScript *script) override;
 };
 }