aboutsummaryrefslogtreecommitdiff
path: root/engines/pegasus
diff options
context:
space:
mode:
authorThierry Crozat2017-07-03 18:59:12 +0100
committerEugene Sandulenko2017-07-10 21:11:20 +0200
commiteefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch)
tree97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /engines/pegasus
parent1141bfc1a603decce8f02a85a1fc76073a646d1a (diff)
downloadscummvm-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 'engines/pegasus')
-rw-r--r--engines/pegasus/gamestate.cpp4
-rw-r--r--engines/pegasus/input.cpp4
2 files changed, 0 insertions, 8 deletions
diff --git a/engines/pegasus/gamestate.cpp b/engines/pegasus/gamestate.cpp
index dfb4f1cd5b..877aeffa1b 100644
--- a/engines/pegasus/gamestate.cpp
+++ b/engines/pegasus/gamestate.cpp
@@ -30,10 +30,6 @@
#include "pegasus/gamestate.h"
#include "pegasus/scoring.h"
-namespace Common {
-DECLARE_SINGLETON(Pegasus::GameStateManager);
-}
-
namespace Pegasus {
Common::Error GameStateManager::writeGameState(Common::WriteStream *stream) {
diff --git a/engines/pegasus/input.cpp b/engines/pegasus/input.cpp
index f4834037d9..0a29a43008 100644
--- a/engines/pegasus/input.cpp
+++ b/engines/pegasus/input.cpp
@@ -30,10 +30,6 @@
#include "pegasus/input.h"
#include "pegasus/pegasus.h"
-namespace Common {
-DECLARE_SINGLETON(Pegasus::InputDeviceManager);
-}
-
namespace Pegasus {
InputDeviceManager::InputDeviceManager() {