aboutsummaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorOri Avtalion2011-06-28 02:06:23 +0300
committerOri Avtalion2011-06-30 22:41:41 +0300
commitaa0f307e06e5aae3b12f9f15b350dc81b30d61de (patch)
treebb7bccb7f56b30e70bd9c267238b4123dfa9d819 /graphics
parent13edea3e8305f6937ee1c9b494e168275c64ad1d (diff)
downloadscummvm-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 'graphics')
-rw-r--r--graphics/cursorman.cpp2
-rw-r--r--graphics/fontman.cpp2
-rw-r--r--graphics/yuv_to_rgb.cpp2
3 files changed, 6 insertions, 0 deletions
diff --git a/graphics/cursorman.cpp b/graphics/cursorman.cpp
index a5498903e2..1d4e482bf4 100644
--- a/graphics/cursorman.cpp
+++ b/graphics/cursorman.cpp
@@ -24,7 +24,9 @@
#include "common/system.h"
#include "common/stack.h"
+namespace Common {
DECLARE_SINGLETON(Graphics::CursorManager);
+}
namespace Graphics {
diff --git a/graphics/fontman.cpp b/graphics/fontman.cpp
index f40cf97602..d1da550747 100644
--- a/graphics/fontman.cpp
+++ b/graphics/fontman.cpp
@@ -23,7 +23,9 @@
#include "graphics/fontman.h"
#include "common/translation.h"
+namespace Common {
DECLARE_SINGLETON(Graphics::FontManager);
+}
namespace Graphics {
diff --git a/graphics/yuv_to_rgb.cpp b/graphics/yuv_to_rgb.cpp
index 037ea9a007..bdc481016e 100644
--- a/graphics/yuv_to_rgb.cpp
+++ b/graphics/yuv_to_rgb.cpp
@@ -189,7 +189,9 @@ const YUVToRGBLookup *YUVToRGBManager::getLookup(Graphics::PixelFormat format) {
} // End of namespace Graphics
+namespace Common {
DECLARE_SINGLETON(Graphics::YUVToRGBManager);
+}
#define YUVToRGBMan (Graphics::YUVToRGBManager::instance())