revised leak test

1 files changed, 9 insertions, 11 deletions

diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index db802754755..70f5f4043dd 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -27,26 +27,24 @@ class PluginManagerI : public PluginManager, public IceUtil::Mutex
 public:
 
     virtual PluginPtr getPlugin(const std::string&);
-
     virtual void addPlugin(const std::string&, const PluginPtr&);
-
     virtual void destroy();
 
-    struct PluginInfo
-    {
-        PluginPtr plugin;
-        IceInternal::DynamicLibraryPtr library;
-    };
-
 private:
 
-    PluginManagerI(const IceInternal::InstancePtr&);
-    void loadPlugins(int&, char*[]);
+    PluginManagerI(const CommunicatorPtr&);
     friend class IceInternal::Instance;
 
+    void loadPlugins(int&, char*[]);
     void loadPlugin(const std::string&, const std::string&, const StringSeq&);
 
-    IceInternal::InstancePtr _instance;
+    CommunicatorPtr _communicator;
+
+    struct PluginInfo
+    {
+        PluginPtr plugin;
+        IceInternal::DynamicLibraryPtr library;
+    };
     std::map<std::string, PluginInfo> _plugins;
 };