diff options
author | Jamieson Christian | 2003-10-10 14:58:13 +0000 |
---|---|---|
committer | Jamieson Christian | 2003-10-10 14:58:13 +0000 |
commit | 504fa5c5e0773174b72f3eb17c952defab1298e9 (patch) | |
tree | 8f7301ca21012535ffc440de9351a9e9778bdc1b /base | |
parent | 87d97ead359fbf41423cc94109bd62a434c0d19e (diff) | |
download | scummvm-rg350-504fa5c5e0773174b72f3eb17c952defab1298e9.tar.gz scummvm-rg350-504fa5c5e0773174b72f3eb17c952defab1298e9.tar.bz2 scummvm-rg350-504fa5c5e0773174b72f3eb17c952defab1298e9.zip |
Hmm, that wasn't the problem after all. Apparently
MSVC6 doesn't like the "using" keyword and consequently
got confused by the namespaces.
svn-id: r10726
Diffstat (limited to 'base')
-rw-r--r-- | base/plugins.h | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/base/plugins.h b/base/plugins.h index f8e70ea37d..74b376042d 100644 --- a/base/plugins.h +++ b/base/plugins.h @@ -85,19 +85,17 @@ typedef Common::List<Plugin *> PluginList; * * @todo Add support for dynamic plugins (this may need additional API, e.g. for a plugin path) */ -using Common::Singleton; -class PluginManager : public Singleton<PluginManager> { +class PluginManager : public Common::Singleton<PluginManager> { private: PluginList _plugins; bool tryLoadPlugin(Plugin *plugin); - friend class Singleton<PluginManager>; - -public: + friend class Common::Singleton<PluginManager>; PluginManager(); ~PluginManager(); +public: void loadPlugins(); void unloadPlugins(); |