[Scummvm-cvs-logs] scummvm master -> 78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7

[criezy]

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:
78a85f581d SHERLOCK: Fix compilation error with some gcc versions


Commit: 78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7
    https://github.com/scummvm/scummvm/commit/78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7
Author: Thierry Crozat (criezy at scummvm.org)
Date: 2016-06-15T22:00:36+01:00

Commit Message:
SHERLOCK: Fix compilation error with some gcc versions

Without this change the Apple gcc 4.0 compiler (the last version to
support the MacOS X 10.4 SDK) generate a lot of errors regarding
trying to initialise references to Sherlock::Scalpel::Talk with the
address to a Sherlock::Talk object, or about forward declarations of Sherlock::Scalpel::Talk.

Changed paths:
    engines/sherlock/scalpel/scalpel_user_interface.h



diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index c0b8672..cc3aaff 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -58,7 +58,7 @@ class Settings;
 
 class ScalpelUserInterface: public UserInterface {
 	friend class Settings;
-	friend class Talk;
+	friend class Sherlock::Talk;
 private:
 	char _keyPress;
 	int _lookHelp;