diff options
| author | Thierry Crozat | 2017-07-03 18:59:12 +0100 |
|---|---|---|
| committer | Eugene Sandulenko | 2017-07-10 21:11:20 +0200 |
| commit | eefa72afa1978a9dea10f5b1833fcc8f58a3468e (patch) | |
| tree | 97ef0c982cad7cc54cf93c0f6a6cec3d072b1a69 /base/plugins.cpp | |
| parent | 1141bfc1a603decce8f02a85a1fc76073a646d1a (diff) | |
| download | scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.gz scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.tar.bz2 scummvm-rg350-eefa72afa1978a9dea10f5b1833fcc8f58a3468e.zip | |
COMMON: Change way the Singleton instances are instantiated
This fixes tons of warnings with clang from a recent xcode version on
macOS (and possibly other systems) complaining that an instantiation
of _singleton is required but no definition is available.
Diffstat (limited to 'base/plugins.cpp')
| -rw-r--r-- | base/plugins.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/base/plugins.cpp b/base/plugins.cpp index 39aaf2f73e..2414102f59 100644 --- a/base/plugins.cpp +++ b/base/plugins.cpp @@ -446,10 +446,6 @@ void PluginManager::addToPluginsInMemList(Plugin *plugin) { #include "engines/metaengine.h" -namespace Common { -DECLARE_SINGLETON(EngineManager); -} - /** * This function works for both cached and uncached PluginManagers. * For the cached version, most of the logic here will short circuit. @@ -539,10 +535,6 @@ 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); } |