[Scummvm-cvs-logs] scummvm master -> 31d1ae653044d1260329f17831fb1b72406d6458

fuzzie fuzzie at fuzzie.org
Wed Feb 1 21:56:03 CET 2012


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
31d1ae6530 Revert "BASE: Get rid of unecessary friend in PluginManagerUncached."


Commit: 31d1ae653044d1260329f17831fb1b72406d6458
    https://github.com/scummvm/scummvm/commit/31d1ae653044d1260329f17831fb1b72406d6458
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-02-01T12:54:40-08:00

Commit Message:
Revert "BASE: Get rid of unecessary friend in PluginManagerUncached."

This reverts commit 1e0de79cf54f2483c819584033ae3405ea7e8011.
The only available constructor for PluginManagerUncached is
protected, so this broke the builds using it.

Changed paths:
    base/plugins.h



diff --git a/base/plugins.h b/base/plugins.h
index 327aaf4..fffb5fb 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -344,6 +344,7 @@ public:
  **/
 class PluginManagerUncached : public PluginManager {
 protected:
+	friend class PluginManager;
 	PluginList _allEnginePlugins;
 	PluginList::iterator _currentPlugin;
 






More information about the Scummvm-git-logs mailing list