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 /graphics | |
| 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 'graphics')
| -rw-r--r-- | graphics/cursorman.cpp | 4 | ||||
| -rw-r--r-- | graphics/fontman.cpp | 4 | ||||
| -rw-r--r-- | graphics/fonts/ttf.cpp | 4 | ||||
| -rw-r--r-- | graphics/yuv_to_rgb.cpp | 4 |
4 files changed, 0 insertions, 16 deletions
diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp index 5fcd2a3602..53e13da9a1 100644 --- a/graphics/cursorman.cpp +++ b/graphics/cursorman.cpp @@ -25,10 +25,6 @@ #include "common/system.h" #include "common/stack.h" -namespace Common { -DECLARE_SINGLETON(Graphics::CursorManager); -} - namespace Graphics { CursorManager::~CursorManager() { diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp index 5cf52416cf..bb3ee03330 100644 --- a/graphics/fontman.cpp +++ b/graphics/fontman.cpp @@ -26,10 +26,6 @@ #include "common/translation.h" -namespace Common { -DECLARE_SINGLETON(Graphics::FontManager); -} - namespace Graphics { FORWARD_DECLARE_FONT(g_sysfont); diff --git a/graphics/fonts/ttf.cpp b/graphics/fonts/ttf.cpp index 76b7f731be..cb9520bb86 100644 --- a/graphics/fonts/ttf.cpp +++ b/graphics/fonts/ttf.cpp @@ -668,9 +668,5 @@ Font *loadTTFFont(Common::SeekableReadStream &stream, int size, TTFSizeMode size } // End of namespace Graphics -namespace Common { -DECLARE_SINGLETON(Graphics::TTFLibrary); -} // End of namespace Common - #endif diff --git a/graphics/yuv_to_rgb.cpp b/graphics/yuv_to_rgb.cpp index 2a485fa664..99cd208ec0 100644 --- a/graphics/yuv_to_rgb.cpp +++ b/graphics/yuv_to_rgb.cpp @@ -86,10 +86,6 @@ #include "graphics/surface.h" #include "graphics/yuv_to_rgb.h" -namespace Common { -DECLARE_SINGLETON(Graphics::YUVToRGBManager); -} - namespace Graphics { class YUVToRGBLookup { |