diff options
author | Max Horn | 2010-11-16 08:23:13 +0000 |
---|---|---|
committer | Max Horn | 2010-11-16 08:23:13 +0000 |
commit | abe1959d36816b6c0703c1c3802764818585d0b6 (patch) | |
tree | 01fd7fe8a0f5bbad700d052c78f954862a11dc5f /backends | |
parent | 5af8a76b489c315f4389f888489030bdcff52ae3 (diff) | |
download | scummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.tar.gz scummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.tar.bz2 scummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.zip |
COMMON: Simplify DECLARE_SINGLETON macro
This makes it possible to write
DECLARE_SINGLETON(foo);
instead of
DECLARE_SINGLETON(foo)
without causing a warning about an extra semicolon.
The extra semicolon helps some editors at parsing the C++ code.
svn-id: r54258
Diffstat (limited to 'backends')
-rw-r--r-- | backends/fs/ds/ds-fs-factory.cpp | 2 | ||||
-rw-r--r-- | backends/fs/ps2/ps2-fs-factory.cpp | 2 | ||||
-rw-r--r-- | backends/fs/psp/psp-fs-factory.cpp | 2 | ||||
-rw-r--r-- | backends/fs/wii/wii-fs-factory.cpp | 2 | ||||
-rw-r--r-- | backends/platform/psp/display_manager.cpp | 2 | ||||
-rw-r--r-- | backends/platform/psp/powerman.cpp | 2 | ||||
-rw-r--r-- | backends/platform/psp/rtc.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp index 4919c04174..0dfa70b716 100644 --- a/backends/fs/ds/ds-fs-factory.cpp +++ b/backends/fs/ds/ds-fs-factory.cpp @@ -27,7 +27,7 @@ #include "backends/fs/ds/ds-fs.h" #include "dsmain.h" //for the isGBAMPAvailable() function -DECLARE_SINGLETON(DSFilesystemFactory) +DECLARE_SINGLETON(DSFilesystemFactory); AbstractFSNode *DSFilesystemFactory::makeRootFileNode() const { if (DS::isGBAMPAvailable()) { diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp index 05c18c8a7f..8b5202bff4 100644 --- a/backends/fs/ps2/ps2-fs-factory.cpp +++ b/backends/fs/ps2/ps2-fs-factory.cpp @@ -30,7 +30,7 @@ #include "backends/fs/ps2/ps2-fs-factory.h" #include "backends/fs/ps2/ps2-fs.cpp" -DECLARE_SINGLETON(Ps2FilesystemFactory) +DECLARE_SINGLETON(Ps2FilesystemFactory); AbstractFSNode *Ps2FilesystemFactory::makeRootFileNode() const { return new Ps2FilesystemNode(); diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp index 7a22954919..7ed84de034 100644 --- a/backends/fs/psp/psp-fs-factory.cpp +++ b/backends/fs/psp/psp-fs-factory.cpp @@ -26,7 +26,7 @@ #include "backends/fs/psp/psp-fs-factory.h" #include "backends/fs/psp/psp-fs.cpp" -DECLARE_SINGLETON(PSPFilesystemFactory) +DECLARE_SINGLETON(PSPFilesystemFactory); AbstractFSNode *PSPFilesystemFactory::makeRootFileNode() const { return new PSPFilesystemNode(); diff --git a/backends/fs/wii/wii-fs-factory.cpp b/backends/fs/wii/wii-fs-factory.cpp index 2e8051029d..6a11d7d12e 100644 --- a/backends/fs/wii/wii-fs-factory.cpp +++ b/backends/fs/wii/wii-fs-factory.cpp @@ -37,7 +37,7 @@ #include <smb.h> #endif -DECLARE_SINGLETON(WiiFilesystemFactory) +DECLARE_SINGLETON(WiiFilesystemFactory); WiiFilesystemFactory::WiiFilesystemFactory() : _dvdMounted(false), diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp index 2c94882a63..6d2c92c474 100644 --- a/backends/platform/psp/display_manager.cpp +++ b/backends/platform/psp/display_manager.cpp @@ -63,7 +63,7 @@ const OSystem::GraphicsMode DisplayManager::_supportedModes[] = { // Class VramAllocator ----------------------------------- -DECLARE_SINGLETON(VramAllocator) +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 869d9b3023..f00a2c0fde 100644 --- a/backends/platform/psp/powerman.cpp +++ b/backends/platform/psp/powerman.cpp @@ -33,7 +33,7 @@ //#define __PSP_DEBUG_PRINT__ #include "backends/platform/psp/trace.h" -DECLARE_SINGLETON(PowerManager) +DECLARE_SINGLETON(PowerManager); // Function to debug the Power Manager (we have no output to screen) inline void PowerManager::debugPM() { diff --git a/backends/platform/psp/rtc.cpp b/backends/platform/psp/rtc.cpp index f26e5770a6..976a5aa3ec 100644 --- a/backends/platform/psp/rtc.cpp +++ b/backends/platform/psp/rtc.cpp @@ -37,7 +37,7 @@ // Class PspRtc --------------------------------------------------------------- -DECLARE_SINGLETON(PspRtc) +DECLARE_SINGLETON(PspRtc); void PspRtc::init() { // init our starting ticks uint32 ticks[2]; |