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 /engines/sword25 | |
| 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 'engines/sword25')
| -rw-r--r-- | engines/sword25/gfx/animationtemplateregistry.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/math/regionregistry.cpp | 2 | ||||
| -rw-r--r-- | engines/sword25/sword25.cpp | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/engines/sword25/gfx/animationtemplateregistry.cpp b/engines/sword25/gfx/animationtemplateregistry.cpp index 43c099c89d..8184b49eba 100644 --- a/engines/sword25/gfx/animationtemplateregistry.cpp +++ b/engines/sword25/gfx/animationtemplateregistry.cpp @@ -34,7 +34,9 @@ #include "sword25/gfx/animationtemplateregistry.h" #include "sword25/gfx/animationtemplate.h" +namespace Common { DECLARE_SINGLETON(Sword25::AnimationTemplateRegistry); +} namespace Sword25 { diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp index dff8560205..68c360a5ee 100644 --- a/engines/sword25/math/regionregistry.cpp +++ b/engines/sword25/math/regionregistry.cpp @@ -34,7 +34,9 @@ #include "sword25/math/regionregistry.h" #include "sword25/math/region.h" +namespace Common { DECLARE_SINGLETON(Sword25::RegionRegistry); +} namespace Sword25 { diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index b111746c32..2201188052 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -50,7 +50,9 @@ #include "sword25/gfx/animationtemplateregistry.h" // Needed so we can destroy the singleton #include "sword25/gfx/renderobjectregistry.h" // Needed so we can destroy the singleton +namespace Common { DECLARE_SINGLETON(Sword25::RenderObjectRegistry); +} #include "sword25/math/regionregistry.h" // Needed so we can destroy the singleton namespace Sword25 { |