aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThierry Crozat2016-06-15 22:00:36 +0100
committerThierry Crozat2016-06-15 22:00:36 +0100
commit78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7 (patch)
treece6c95630669094bc6a9fc451af1e5bb719daba4
parentf2f04b5eddef081a8e31666d6afdcd9bec3dace7 (diff)
downloadscummvm-rg350-78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7.tar.gz
scummvm-rg350-78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7.tar.bz2
scummvm-rg350-78a85f581d1b7013ce42d9c9271c43f1b6dcf0b7.zip
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.
-rw-r--r--engines/sherlock/scalpel/scalpel_user_interface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/sherlock/scalpel/scalpel_user_interface.h b/engines/sherlock/scalpel/scalpel_user_interface.h
index c0b8672a87..cc3aafff65 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;