[Scummvm-cvs-logs] CVS: scummvm/base plugins.h,1.5,1.6
Jamieson Christian
jamieson630 at users.sourceforge.net
Fri Oct 10 07:59:04 CEST 2003
Update of /cvsroot/scummvm/scummvm/base
In directory sc8-pr-cvs1:/tmp/cvs-serv4887/scummvm/base
Modified Files:
plugins.h
Log Message:
Hmm, that wasn't the problem after all. Apparently
MSVC6 doesn't like the "using" keyword and consequently
got confused by the namespaces.
Index: plugins.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/base/plugins.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- plugins.h 10 Oct 2003 14:01:30 -0000 1.5
+++ plugins.h 10 Oct 2003 14:58:13 -0000 1.6
@@ -85,19 +85,17 @@
*
* @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();
More information about the Scummvm-git-logs
mailing list