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/fs | |
| 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/fs')
| -rw-r--r-- | backends/fs/palmos/palmos-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 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backends/fs/palmos/palmos-fs-factory.cpp b/backends/fs/palmos/palmos-fs-factory.cpp index 889d541571..97b3644205 100644 --- a/backends/fs/palmos/palmos-fs-factory.cpp +++ b/backends/fs/palmos/palmos-fs-factory.cpp @@ -26,7 +26,7 @@ #include "backends/fs/palmos/palmos-fs-factory.h" #include "backends/fs/palmos/palmos-fs.cpp" -DECLARE_SINGLETON(PalmOSFilesystemFactory); +DECLARE_SINGLETON(PalmOSFilesystemFactory) AbstractFSNode *PalmOSFilesystemFactory::makeRootFileNode() const { return new PalmOSFilesystemNode(); diff --git a/backends/fs/ps2/ps2-fs-factory.cpp b/backends/fs/ps2/ps2-fs-factory.cpp index 18478b4f3d..8d3c22d2d0 100644 --- a/backends/fs/ps2/ps2-fs-factory.cpp +++ b/backends/fs/ps2/ps2-fs-factory.cpp @@ -26,7 +26,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 7ed84de034..7a22954919 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 c06b6e5d5f..5bc8ba56f5 100644 --- a/backends/fs/wii/wii-fs-factory.cpp +++ b/backends/fs/wii/wii-fs-factory.cpp @@ -36,7 +36,7 @@ #include <smb.h> #endif -DECLARE_SINGLETON(WiiFilesystemFactory); +DECLARE_SINGLETON(WiiFilesystemFactory) WiiFilesystemFactory::WiiFilesystemFactory() : _dvdMounted(false), |