aboutsummaryrefslogtreecommitdiff
path: root/base/plugins.h
diff options
context:
space:
mode:
authorMax Horn2005-01-01 19:19:06 +0000
committerMax Horn2005-01-01 19:19:06 +0000
commit74bf578bda4c9adcc70ce4cda7d4617a9b95267c (patch)
treeb46f1664b5ffd69ebc5623f83444fd7f5de724e2 /base/plugins.h
parentc418282ec724d01e37b13f7372aa2d6b48f6cbe2 (diff)
downloadscummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.gz
scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.tar.bz2
scummvm-rg350-74bf578bda4c9adcc70ce4cda7d4617a9b95267c.zip
Changed the singleton code to allow for custom object factories; this allowed me to change OSystem to use the singleton base class, too
svn-id: r16404
Diffstat (limited to 'base/plugins.h')
-rw-r--r--base/plugins.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/base/plugins.h b/base/plugins.h
index b1eec1328d..6252bfeaaf 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -103,6 +103,8 @@ public:
typedef Common::Array<Plugin *> PluginList;
+class PluginManager;
+
/**
* Instances of this class manage all plugins, including loading them,
* making wrapper objects of class Plugin available, and unloading them.
@@ -115,7 +117,7 @@ private:
bool tryLoadPlugin(Plugin *plugin);
- friend class Common::Singleton<PluginManager>;
+ friend SingletonBaseType *makeInstance<>();
PluginManager();
public: