[Scummvm-cvs-logs] scummvm master -> 2ddc81ec48364ecf806b384b0e768b856d8c47be

[eriktorbjorn]

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:
2ddc81ec48 SHERLOCK: Fix compilation with GCC


Commit: 2ddc81ec48364ecf806b384b0e768b856d8c47be
    https://github.com/scummvm/scummvm/commit/2ddc81ec48364ecf806b384b0e768b856d8c47be
Author: Torbjörn Andersson (eriktorbjorn at users.sourceforge.net)
Date: 2015-05-30T17:45:39+02:00

Commit Message:
SHERLOCK: Fix compilation with GCC

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 8ed69ac8..262cd29 100644
--- a/engines/sherlock/scalpel/scalpel_user_interface.h
+++ b/engines/sherlock/scalpel/scalpel_user_interface.h
@@ -44,7 +44,7 @@ extern const char *const PRESS_KEY_TO_CONTINUE;
 class Settings;
 
 class ScalpelUserInterface: public UserInterface {
-	friend class Inventory;
+	friend class Sherlock::Inventory;
 	friend class Settings;
 	friend class Talk;
 private: