aboutsummaryrefslogtreecommitdiff
path: root/common/system.h
diff options
context:
space:
mode:
authorMax Horn2005-01-01 18:53:47 +0000
committerMax Horn2005-01-01 18:53:47 +0000
commitf52be9df681358564991e0988bf70160970104ad (patch)
treed7de4493e5f6e7c0b229014707a915d0b42d07e3 /common/system.h
parent03d4a6fa47e73ddbddc6bc096f6cef14ea7d7441 (diff)
downloadscummvm-rg350-f52be9df681358564991e0988bf70160970104ad.tar.gz
scummvm-rg350-f52be9df681358564991e0988bf70160970104ad.tar.bz2
scummvm-rg350-f52be9df681358564991e0988bf70160970104ad.zip
Changed OSystem::instance() to return a reference, not a pointer (it now matches the Singleton interface)
svn-id: r16402
Diffstat (limited to 'common/system.h')
-rw-r--r--common/system.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/system.h b/common/system.h
index b1d33e34b8..2a3b0fafc1 100644
--- a/common/system.h
+++ b/common/system.h
@@ -47,7 +47,7 @@ public:
* not a real class (and thus it isn't based on our Singleton template).
* @return the pointer to the (singleton) OSystem instance
*/
- static OSystem *instance();
+ static OSystem &instance();
public:
@@ -687,7 +687,7 @@ public:
};
/** The global OSystem instance. Inited in main(). */
-#define g_system (OSystem::instance())
+#define g_system (&OSystem::instance())
namespace Common {