aboutsummaryrefslogtreecommitdiff
path: root/base
diff options
context:
space:
mode:
authorMax Horn2010-11-16 08:23:13 +0000
committerMax Horn2010-11-16 08:23:13 +0000
commitabe1959d36816b6c0703c1c3802764818585d0b6 (patch)
tree01fd7fe8a0f5bbad700d052c78f954862a11dc5f /base
parent5af8a76b489c315f4389f888489030bdcff52ae3 (diff)
downloadscummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.tar.gz
scummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.tar.bz2
scummvm-rg350-abe1959d36816b6c0703c1c3802764818585d0b6.zip
COMMON: Simplify DECLARE_SINGLETON macro
This makes it possible to write DECLARE_SINGLETON(foo); instead of DECLARE_SINGLETON(foo) without causing a warning about an extra semicolon. The extra semicolon helps some editors at parsing the C++ code. svn-id: r54258
Diffstat (limited to 'base')
-rw-r--r--base/plugins.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp
index 41e213a53a..e881944a1b 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -300,7 +300,7 @@ void FilePluginProvider::addCustomDirectories(Common::FSList &dirs) const {
#pragma mark -
-DECLARE_SINGLETON(PluginManager)
+DECLARE_SINGLETON(PluginManager);
PluginManager::PluginManager() {
// Always add the static plugin provider.
@@ -450,7 +450,7 @@ void PluginManager::addToPluginsInMemList(Plugin *plugin) {
#include "engines/metaengine.h"
-DECLARE_SINGLETON(EngineManager)
+DECLARE_SINGLETON(EngineManager);
GameDescriptor EngineManager::findGameOnePluginAtATime(const Common::String &gameName, const EnginePlugin **plugin) const {
GameDescriptor result;
@@ -514,7 +514,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);