Revert "COMMON: Change way the Singleton instances are instantiated"

This reverts commit eefa72afa1978a9dea10f5b1833fcc8f58a3468e.

With this patch ConfigManager is broken.

3 files changed, 11 insertions, 0 deletions

diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp
index ffd37414be..2e995c809e 100644
--- a/backends/platform/psp/display_manager.cpp
+++ b/backends/platform/psp/display_manager.cpp
@@ -62,6 +62,10 @@ const OSystem::GraphicsMode DisplayManager::_supportedModes[] = {
 
 // Class VramAllocator -----------------------------------
 
+namespace Common {
+DECLARE_SINGLETON(VramAllocator);
+}
+
 //#define __PSP_DEBUG_FUNCS__	/* For debugging the stack */
 //#define __PSP_DEBUG_PRINT__
 
diff --git a/backends/platform/psp/powerman.cpp b/backends/platform/psp/powerman.cpp
index 4b415ef50e..3cd663e3c7 100644
--- a/backends/platform/psp/powerman.cpp
+++ b/backends/platform/psp/powerman.cpp
@@ -30,6 +30,10 @@
 //#define __PSP_DEBUG_PRINT__
 #include "backends/platform/psp/trace.h"
 
+namespace Common {
+DECLARE_SINGLETON(PowerManager);
+}
+
 // Function to debug the Power Manager (we have no output to screen)
 inline void PowerManager::debugPM() {
 	PSP_DEBUG_PRINT("PM status[%d]. Listcount[%d]. CriticalCount[%d]. ThreadId[%x]. Error[%d]\n",
diff --git a/backends/platform/psp/rtc.cpp b/backends/platform/psp/rtc.cpp
index 67ad36c334..d01bd8f83a 100644
--- a/backends/platform/psp/rtc.cpp
+++ b/backends/platform/psp/rtc.cpp
@@ -34,6 +34,9 @@
 
 
 // Class PspRtc ---------------------------------------------------------------
+namespace Common {
+DECLARE_SINGLETON(PspRtc);
+}
 
 void PspRtc::init() {						// init our starting ticks
 	uint32 ticks[2];