diff options
| author | Thierry Crozat | 2017-07-03 18:59:12 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-10 21:11:20 +0200 |
| commit | eefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch) | |
| tree | 97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /gui | |
| parent | 1141bfc1a603decce8f02a85a1fc76073a646d1a (diff) | |
| download | scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.gz scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.bz2 scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.zip | |
COMMON: Change way the Singleton instances are instantiated
This fixes tons of warnings with clang from a recent xcode version on
macOS (and possibly other systems) complaining that an instantiation
of _singleton is required but no definition is available.
Diffstat (limited to 'gui')
| -rw-r--r-- | gui/EventRecorder.cpp | 4 | ||||
| -rw-r--r-- | gui/gui-manager.cpp | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/gui/EventRecorder.cpp b/gui/EventRecorder.cpp index 3f91cfa259..ccf051f6d8 100644 --- a/gui/EventRecorder.cpp +++ b/gui/EventRecorder.cpp @@ -25,10 +25,6 @@ #ifdef ENABLE_EVENTRECORDER -namespace Common { -DECLARE_SINGLETON(GUI::EventRecorder); -} - #include "common/debug-channels.h" #include "backends/timer/sdl/sdl-timer.h" #include "backends/mixer/sdl/sdl-mixer.h" diff --git a/gui/gui-manager.cpp b/gui/gui-manager.cpp index 76f557711d..12a0320a8c 100644 --- a/gui/gui-manager.cpp +++ b/gui/gui-manager.cpp @@ -41,10 +41,6 @@ #include "graphics/cursorman.h" -namespace Common { -DECLARE_SINGLETON(GUI::GuiManager); -} - namespace GUI { enum { |