Ticket #8391: makeinstance.patch

common/system.h

@@ -29 +29 @@
 #include "common/savefile.h"
 #include "common/singleton.h"
 
-class OSystem;
-
-/**
- * Custom object factory for OSystem.
- */
-template <>
-OSystem *Common::Singleton<OSystem>::makeInstance();
-
 
 /**
  * Interface for ScummVM backends. If you want to port ScummVM to a system
@@ -49 +41 @@
  * control audio CD playback, and sound output.
  */
 class OSystem : public Common::Singleton<OSystem> {
+protected:
+        static OSystem *createSystem();
+        friend class Common::Singleton<SingletonBaseType>;
+
 public:
         
         /** @name Feature flags */
@@ -682 +678 @@
         //@}
 };
 
+/**
+ * Custom object factory for OSystem.
+ */
+template <>
+OSystem *Common::Singleton<OSystem>::makeInstance() {
+        return OSystem::createSystem();
+}
+
+
+
 /** The global OSystem instance. Inited in main(). */
 #define g_system        (&OSystem::instance())
 

common/system.cpp

@@ -33 +33 @@
 
 DECLARE_SINGLETON(OSystem);
 
-template <>
-OSystem *Common::Singleton<OSystem>::makeInstance() {
+OSystem *OSystem::createSystem() {
         // Attention: Do not call parseGraphicsMode() here, nor any other function
         // which needs to access the OSystem instance, else you get stuck in an
         // endless loop.