diff options
| author | Johannes Schickel | 2010-04-12 19:50:40 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-04-12 19:50:40 +0000 |
| commit | 23ed4c2a76f924dd17a43edda5559ad8efa71488 (patch) | |
| tree | 5ca090097297c08359f7b1cd36cd832165451747 /engines/kyra | |
| parent | b5612d0cf6016dae72082c916859b041939cbd25 (diff) | |
| download | scummvm-rg350-23ed4c2a76f924dd17a43edda5559ad8efa71488.tar.gz scummvm-rg350-23ed4c2a76f924dd17a43edda5559ad8efa71488.tar.bz2 scummvm-rg350-23ed4c2a76f924dd17a43edda5559ad8efa71488.zip | |
Revert "Fix use of "friend" keyword in KYRA for strict C++ compilers."
Actually g++ is just fine in this case :-). The thing I missed here
was that I declared the "offending" classes as friends in subclasses
of KyraEngine_v1, thus those friends were allowed to access the
protected elements of KyraEngine_v1 too.
svn-id: r48643
Diffstat (limited to 'engines/kyra')
| -rw-r--r-- | engines/kyra/kyra_v1.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h index 002ede08b8..a30f0e7a27 100644 --- a/engines/kyra/kyra_v1.h +++ b/engines/kyra/kyra_v1.h @@ -177,9 +177,6 @@ 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); |