diff options
| author | Johannes Schickel | 2010-04-12 19:10:21 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-04-12 19:10:21 +0000 |
| commit | 050aca584ba9b77c169b707db2e2a427e8c92637 (patch) | |
| tree | 169e2a381ffd162a1cd22c6158934b299310661d /engines | |
| parent | fe566293e71ecb481d67f3c748759986acd92f0f (diff) | |
| download | scummvm-rg350-050aca584ba9b77c169b707db2e2a427e8c92637.tar.gz scummvm-rg350-050aca584ba9b77c169b707db2e2a427e8c92637.tar.bz2 scummvm-rg350-050aca584ba9b77c169b707db2e2a427e8c92637.zip | |
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.
svn-id: r48641
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index a30f0e7a27..002ede08b8 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -177,6 +177,9 @@ class KyraEngine_v1 : public Engine { 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); |