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/fs/ds | |
| 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/fs/ds')
| -rw-r--r-- | backends/fs/ds/ds-fs-factory.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/backends/fs/ds/ds-fs-factory.cpp b/backends/fs/ds/ds-fs-factory.cpp index 3fd97d07eb..4e09c3446b 100644 --- a/backends/fs/ds/ds-fs-factory.cpp +++ b/backends/fs/ds/ds-fs-factory.cpp @@ -27,7 +27,9 @@ #include "backends/fs/ds/ds-fs.h" #include "dsmain.h" //for the isGBAMPAvailable() function +namespace Common { DECLARE_SINGLETON(DSFilesystemFactory); +} AbstractFSNode *DSFilesystemFactory::makeRootFileNode() const { if (DS::isGBAMPAvailable()) { |