Skip to content

Commit

Permalink
KOTORBASE: Fix ODR violation
Browse files Browse the repository at this point in the history
GCC 10.2 reports an ODR warning due to a mismatch in type
Engines::KotORBase::Game. Specifically, the type ambiguity of the
`_console` member means in some source files it gets resolved as
Engines::Console and sometimes as Engines::KotORBase::Console.

This fixes the ambiguity.
  • Loading branch information
lacc97 authored and DrMcCoy committed Aug 25, 2020
1 parent 9a608b3 commit b347a65
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/engines/kotorbase/game.h
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class Game {
virtual void run() = 0;

protected:
Console *_console;
Engines::Console *_console;
std::unique_ptr<KotORBase::Module> _module;
std::vector<Common::UString> _modules;
Sound::ChannelHandle _menuMusic;
Expand Down

0 comments on commit b347a65

Please sign in to comment.