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 /base/plugins.cpp | |
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 'base/plugins.cpp')
-rw-r--r-- | base/plugins.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index 4c2fd2cffc..4413995b88 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -540,7 +540,9 @@ void PluginManager::addToPluginsInMemList(Plugin *plugin) { #include "engines/metaengine.h" +namespace Common { DECLARE_SINGLETON(EngineManager); +} /** * This function works for both cached and uncached PluginManagers. @@ -631,7 +633,9 @@ const EnginePlugin::List &EngineManager::getPlugins() const { #include "audio/musicplugin.h" +namespace Common { DECLARE_SINGLETON(MusicManager); +} const MusicPlugin::List &MusicManager::getPlugins() const { return (const MusicPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MUSIC); |