diff options
| author | Thierry Crozat | 2017-07-03 18:59:12 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-10 21:11:20 +0200 |
| commit | eefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch) | |
| tree | 97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /engines/sword25 | |
| parent | 1141bfc1a603decce8f02a85a1fc76073a646d1a (diff) | |
| download | scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.gz scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.bz2 scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.zip | |
COMMON: Change way the Singleton instances are instantiated
This fixes tons of warnings with clang from a recent xcode version on
macOS (and possibly other systems) complaining that an instantiation
of _singleton is required but no definition is available.
Diffstat (limited to 'engines/sword25')
| -rw-r--r-- | engines/sword25/gfx/animationtemplateregistry.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/math/regionregistry.cpp | 4 | ||||
| -rw-r--r-- | engines/sword25/sword25.cpp | 3 |
3 files changed, 0 insertions, 11 deletions
diff --git a/engines/sword25/gfx/animationtemplateregistry.cpp b/engines/sword25/gfx/animationtemplateregistry.cpp index 4783a314f4..875483d66f 100644 --- a/engines/sword25/gfx/animationtemplateregistry.cpp +++ b/engines/sword25/gfx/animationtemplateregistry.cpp @@ -34,10 +34,6 @@ #include "sword25/gfx/animationtemplateregistry.h" #include "sword25/gfx/animationtemplate.h" -namespace Common { -DECLARE_SINGLETON(Sword25::AnimationTemplateRegistry); -} - namespace Sword25 { bool AnimationTemplateRegistry::persist(OutputPersistenceBlock &writer) { diff --git a/engines/sword25/math/regionregistry.cpp b/engines/sword25/math/regionregistry.cpp index 35a5fb4b88..bfa82bc474 100644 --- a/engines/sword25/math/regionregistry.cpp +++ b/engines/sword25/math/regionregistry.cpp @@ -34,10 +34,6 @@ #include "sword25/math/regionregistry.h" #include "sword25/math/region.h" -namespace Common { -DECLARE_SINGLETON(Sword25::RegionRegistry); -} - namespace Sword25 { bool RegionRegistry::persist(OutputPersistenceBlock &writer) { diff --git a/engines/sword25/sword25.cpp b/engines/sword25/sword25.cpp index b6f2641714..1e3a68847a 100644 --- a/engines/sword25/sword25.cpp +++ b/engines/sword25/sword25.cpp @@ -50,9 +50,6 @@ #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 { |