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.

9 files changed, 0 insertions, 34 deletions

diff --git a/engines/engine.cpp b/engines/engine.cpp
index bb51e77f0d..2edb77b8f2 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -133,10 +133,6 @@ bool ChainedGamesManager::pop(Common::String &target, int &slot) {
 	return true;
 }
 
-namespace Common {
-DECLARE_SINGLETON(ChainedGamesManager);
-}
-
 Engine::Engine(OSystem *syst)
 	: _system(syst),
 		_mixer(_system->getMixer()),
diff --git a/engines/lure/sound.cpp b/engines/lure/sound.cpp
index bea0dbf9f4..4cb6c44724 100644
--- a/engines/lure/sound.cpp
+++ b/engines/lure/sound.cpp
@@ -31,10 +31,6 @@
 #include "common/endian.h"
 #include "audio/midiparser.h"
 
-namespace Common {
-DECLARE_SINGLETON(Lure::SoundManager);
-}
-
 namespace Lure {
 
 //#define SOUND_CROP_CHANNELS
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() {
diff --git a/engines/sword25/gfx/animationtemplateregistry.cpp b/engines/sword25/gfx/animationtemplateregistry.cpp
index 4783a314f4..875483d66f 100644
--- a/engines/sword25/gfx/animationtemplateregistry.cpp
+++ b/engines/sword25/gfx/animationtemplateregistry.cpp
@@ -34,10 +34,6 @@
 #include "sword25/gfx/animationtemplateregistry.h"
 #include "sword25/gfx/animationtemplate.h"
 
-namespace Common {
-DECLARE_SINGLETON(Sword25::AnimationTemplateRegistry);
-}
-
 namespace Sword25 {
 
 bool AnimationTemplateRegistry::persist(OutputPersistenceBlock &writer) {
diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp
index 35a5fb4b88..bfa82bc474 100644
--- a/engines/sword25/math/regionregistry.cpp
+++ b/engines/sword25/math/regionregistry.cpp
@@ -34,10 +34,6 @@
 #include "sword25/math/regionregistry.h"
 #include "sword25/math/region.h"
 
-namespace Common {
-DECLARE_SINGLETON(Sword25::RegionRegistry);
-}
-
 namespace Sword25 {
 
 bool RegionRegistry::persist(OutputPersistenceBlock &writer) {
diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp
index b6f2641714..1e3a68847a 100644
--- a/engines/sword25/sword25.cpp
+++ b/engines/sword25/sword25.cpp
@@ -50,9 +50,6 @@
 
 #include "sword25/gfx/animationtemplateregistry.h"	// Needed so we can destroy the singleton
 #include "sword25/gfx/renderobjectregistry.h"		// Needed so we can destroy the singleton
-namespace Common {
-DECLARE_SINGLETON(Sword25::RenderObjectRegistry);
-}
 #include "sword25/math/regionregistry.h"			// Needed so we can destroy the singleton
 
 namespace Sword25 {
diff --git a/engines/testbed/config-params.cpp b/engines/testbed/config-params.cpp
index 1aa97168c1..3ec47fbe1b 100644
--- a/engines/testbed/config-params.cpp
+++ b/engines/testbed/config-params.cpp
@@ -25,10 +25,6 @@
 
 #include "testbed/config-params.h"
 
-namespace Common {
-DECLARE_SINGLETON(Testbed::ConfigParams);
-}
-
 namespace Testbed {
 
 ConfigParams::ConfigParams() {
diff --git a/engines/wintermute/base/base_engine.cpp b/engines/wintermute/base/base_engine.cpp
index 4ce334aceb..28bdb53e3b 100644
--- a/engines/wintermute/base/base_engine.cpp
+++ b/engines/wintermute/base/base_engine.cpp
@@ -32,9 +32,6 @@
 #include "engines/wintermute/wintermute.h"
 #include "engines/wintermute/system/sys_class_registry.h"
 #include "common/system.h"
-namespace Common {
-DECLARE_SINGLETON(Wintermute::BaseEngine);
-}
 
 namespace Wintermute {