diff options
| author | Johannes Schickel | 2010-03-13 21:55:49 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-03-13 21:55:49 +0000 |
| commit | 40562798d6670775768224f77514ed000ff78c38 (patch) | |
| tree | 4798a9207e4467c273339e8058f749304115f4db /backends/platform | |
| parent | 958fa8d5cbe1ccffdaf6812f39238fccb67307a4 (diff) | |
| download | scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.tar.gz scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.tar.bz2 scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.zip | |
Fix our DECLARE_SINGLETON macro to conform to the C++ specs.
We need to use a namespace Common { } there to make strict C++ compilers
like clang++ and comeau happy. I also added a slight comment about why
that is needed to the macro definition and a note that you need to use
it from the global namespace.
svn-id: r48254
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/psp/powerman.cpp | 2 | ||||
| -rw-r--r-- | backends/platform/psp/psploader.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/backends/platform/psp/powerman.cpp b/backends/platform/psp/powerman.cpp index f00272384d..2f0086089c 100644 --- a/backends/platform/psp/powerman.cpp +++ b/backends/platform/psp/powerman.cpp @@ -30,7 +30,7 @@ #include "./trace.h" #include "engine.h" -DECLARE_SINGLETON(PowerManager); +DECLARE_SINGLETON(PowerManager) #ifdef __PSP_DEBUG_SUSPEND__ void PowerManager::debugPM() { diff --git a/backends/platform/psp/psploader.cpp b/backends/platform/psp/psploader.cpp index e720fbe4a1..94310936f6 100644 --- a/backends/platform/psp/psploader.cpp +++ b/backends/platform/psp/psploader.cpp @@ -51,7 +51,7 @@ extern char __plugin_hole_start; // Indicates start of hole in program file for extern char __plugin_hole_end; // Indicates end of hole in program file extern char _gp[]; // Value of gp register -DECLARE_SINGLETON(ShortSegmentManager); // For singleton +DECLARE_SINGLETON(ShortSegmentManager) // For singleton // Get rid of symbol table in memory void DLObject::discard_symtab() { |