[Scummvm-cvs-logs] SF.net SVN: scummvm:[48641] scummvm/trunk/engines/kyra/kyra_v1.h
lordhoto at users.sourceforge.net
lordhoto at users.sourceforge.net
Mon Apr 12 21:10:22 CEST 2010
Revision: 48641
http://scummvm.svn.sourceforge.net/scummvm/?rev=48641&view=rev
Author: lordhoto
Date: 2010-04-12 19:10:21 +0000 (Mon, 12 Apr 2010)
Log Message:
-----------
Fix use of "friend" keyword in KYRA for strict C++ compilers.
Unlike g++, which does inherit friends (it seems), C++ does
specify that friend is not inherited. I.e. when B is a friend of
A and you have a class C subclassing B, C is not allowed to
access private memebers of A.
Modified Paths:
--------------
scummvm/trunk/engines/kyra/kyra_v1.h
Modified: scummvm/trunk/engines/kyra/kyra_v1.h
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v1.h 2010-04-12 11:43:14 UTC (rev 48640)
+++ scummvm/trunk/engines/kyra/kyra_v1.h 2010-04-12 19:10:21 UTC (rev 48641)
@@ -177,6 +177,9 @@
friend class Debugger;
friend class ::KyraMetaEngine;
friend class GUI;
+friend class GUI_LoL;
+friend class GUI_LoK;
+friend class GUI_v2;
friend class SoundMidiPC; // For _eventMan
public:
KyraEngine_v1(OSystem *system, const GameFlags &flags);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list