[Scummvm-git-logs] scummvm branch-2-1 -> 5a6c4ecdb15a486c2ba754488e59636ac70ee583

[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:
5a6c4ecdb1 COMMON: Workaround for a compiler bug in osx_intel buildbot toolchain


Commit: 5a6c4ecdb15a486c2ba754488e59636ac70ee583
    https://github.com/scummvm/scummvm/commit/5a6c4ecdb15a486c2ba754488e59636ac70ee583
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2019-09-23T22:20:44+02:00

Commit Message:
COMMON: Workaround for a compiler bug in osx_intel buildbot toolchain

It was introduced in 014bef9eab9fb409cfb3ec66830e033e4aaa29a9. There is
nothing wrong with our code, but strangely, it makes the
i686-apple-darwin9-as v1.38 to choke when parsing .stabd directives.

Once we upgrade buildbot or do another change to system.h, hopefully
this could be removed.

Changed paths:
    common/system.h


diff --git a/common/system.h b/common/system.h
index ae0575f..30c2ea9 100644
--- a/common/system.h
+++ b/common/system.h
@@ -222,6 +222,10 @@ protected:
 	 */
 	Common::String _clipboard;
 
+	// WORKAROUND. The 014bef9eab9fb409cfb3ec66830e033e4aaa29a9 triggered a bug
+	// in the osx_intel toolchain. Adding this variable fixes it.
+	bool _dummyUnused;
+
 private:
 	/**
 	 * Indicate if initBackend() has been called.
@@ -1524,7 +1528,7 @@ public:
 	virtual bool isConnectionLimited();
 
 	//@}
-	
+
 protected:
 
 	/**