diff options
author | Ori Avtalion | 2011-06-28 02:06:23 +0300 |
---|---|---|
committer | Ori Avtalion | 2011-06-30 22:41:41 +0300 |
commit | aa0f307e06e5aae3b12f9f15b350dc81b30d61de (patch) | |
tree | bb7bccb7f56b30e70bd9c267238b4123dfa9d819 /backends/platform/psp | |
parent | 13edea3e8305f6937ee1c9b494e168275c64ad1d (diff) | |
download | scummvm-rg350-aa0f307e06e5aae3b12f9f15b350dc81b30d61de.tar.gz scummvm-rg350-aa0f307e06e5aae3b12f9f15b350dc81b30d61de.tar.bz2 scummvm-rg350-aa0f307e06e5aae3b12f9f15b350dc81b30d61de.zip |
ALL: Require DECLARE_SINGLETON to be used in the Common namepsace
Silences the clang warning:
static data member specialization of '_singleton' must
originally be declared in namespace 'Common'; accepted as a C++0x
extension [-Wc++0x-extensions]
Wrapping "namespace Common {}" around the macro assignment causes clang
to complain about a spurious semicolon, and removing the semicolon at
the end of the macro causes some editors to misbehave.
Changing the requirement of using the macro in one namespace (the
global) to another (Common) seems a small price to pay to
silence a warning.
Diffstat (limited to 'backends/platform/psp')
-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 |
3 files changed, 6 insertions, 0 deletions
diff --git a/backends/platform/psp/display_manager.cpp b/backends/platform/psp/display_manager.cpp index e945dca4a8..422805714f 100644 --- a/backends/platform/psp/display_manager.cpp +++ b/backends/platform/psp/display_manager.cpp @@ -62,7 +62,9 @@ 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 fe9dcfa673..b72d05809d 100644 --- a/backends/platform/psp/powerman.cpp +++ b/backends/platform/psp/powerman.cpp @@ -30,7 +30,9 @@ //#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() { diff --git a/backends/platform/psp/rtc.cpp b/backends/platform/psp/rtc.cpp index 3d6d4295a6..6c8e919986 100644 --- a/backends/platform/psp/rtc.cpp +++ b/backends/platform/psp/rtc.cpp @@ -34,7 +34,9 @@ // Class PspRtc --------------------------------------------------------------- +namespace Common { DECLARE_SINGLETON(PspRtc); +} void PspRtc::init() { // init our starting ticks uint32 ticks[2]; |