diff options
| author | Johannes Schickel | 2010-03-13 21:55:49 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-03-13 21:55:49 +0000 |
| commit | 40562798d6670775768224f77514ed000ff78c38 (patch) | |
| tree | 4798a9207e4467c273339e8058f749304115f4db /base | |
| parent | 958fa8d5cbe1ccffdaf6812f39238fccb67307a4 (diff) | |
| download | scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.tar.gz scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.tar.bz2 scummvm-rg350-40562798d6670775768224f77514ed000ff78c38.zip | |
Fix our DECLARE_SINGLETON macro to conform to the C++ specs.
We need to use a namespace Common { } there to make strict C++ compilers
like clang++ and comeau happy. I also added a slight comment about why
that is needed to the macro definition and a note that you need to use
it from the global namespace.
svn-id: r48254
Diffstat (limited to 'base')
| -rw-r--r-- | base/plugins.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index c68fd7c461..6c80da65d4 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -283,7 +283,7 @@ void FilePluginProvider::addCustomDirectories(Common::FSList &dirs) const { #pragma mark - -DECLARE_SINGLETON(PluginManager); +DECLARE_SINGLETON(PluginManager) PluginManager::PluginManager() { // Always add the static plugin provider. @@ -375,7 +375,7 @@ bool PluginManager::tryLoadPlugin(Plugin *plugin) { #include "engines/metaengine.h" -DECLARE_SINGLETON(EngineManager); +DECLARE_SINGLETON(EngineManager) GameDescriptor EngineManager::findGame(const Common::String &gameName, const EnginePlugin **plugin) const { // Find the GameDescriptor for this target @@ -421,7 +421,7 @@ const EnginePlugin::List &EngineManager::getPlugins() const { #include "sound/musicplugin.h" -DECLARE_SINGLETON(MusicManager); +DECLARE_SINGLETON(MusicManager) const MusicPlugin::List &MusicManager::getPlugins() const { return (const MusicPlugin::List &)PluginManager::instance().getPlugins(PLUGIN_TYPE_MUSIC); |