thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

COMMON: Simplify DECLARE_SINGLETON macro

Browse source 
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
This commit is contained in:
Max Horn 2010-11-16 08:23:13 +00:00
parent 5af8a76b48
commit abe1959d36
23 changed files with 32 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

6
base/plugins.cpp
View file

@ -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);