1 files changed, 10 insertions, 19 deletions
diff --git a/cpp/src/IceStorm/Parser.h b/cpp/src/IceStorm/Parser.h
index c297617f707..e2cf48481dd 100644
--- a/cpp/src/IceStorm/Parser.h
+++ b/cpp/src/IceStorm/Parser.h
@@ -5,7 +5,6 @@
 #ifndef ICE_STORM_PARSER_H
 #define ICE_STORM_PARSER_H
 
-#include <IceUtil/Handle.h>
 #include <IceStorm/IceStorm.h>
 #include <list>
 #include <stdio.h>
@@ -37,18 +36,12 @@ YY_DECL;
 namespace IceStorm
 {
 
-//
-// Forward declaration.
-//
-class Parser;
-typedef ::IceUtil::Handle<Parser> ParserPtr;
-
-class Parser : public ::IceUtil::SimpleShared
+class Parser
 {
 public:
 
-    static ParserPtr createParser(const Ice::CommunicatorPtr&, const TopicManagerPrx&,
-                                  const std::map<Ice::Identity, TopicManagerPrx>&);
+    Parser(std::shared_ptr<Ice::Communicator>, std::shared_ptr<TopicManagerPrx>,
+           std::map<Ice::Identity, std::shared_ptr<TopicManagerPrx>>);
 
     void usage();
 
@@ -88,17 +81,15 @@ public:
 
 private:
 
-    TopicManagerPrx findManagerById(const std::string&, std::string&) const;
-    TopicManagerPrx findManagerByCategory(const std::string&) const;
-    TopicPrx findTopic(const std::string&) const;
-
-    Parser(const Ice::CommunicatorPtr&, const TopicManagerPrx&, const std::map<Ice::Identity, TopicManagerPrx>&);
+    std::shared_ptr<TopicManagerPrx> findManagerById(const std::string&, std::string&) const;
+    std::shared_ptr<TopicManagerPrx> findManagerByCategory(const std::string&) const;
+    std::shared_ptr<TopicPrx> findTopic(const std::string&) const;
 
-    void exception(const Ice::Exception&, bool = false);
+    void exception(std::exception_ptr, bool = false);
 
-    const Ice::CommunicatorPtr _communicator;
-    TopicManagerPrx _defaultManager;
-    const std::map<Ice::Identity, TopicManagerPrx> _managers;
+    const std::shared_ptr<Ice::Communicator> _communicator;
+    std::shared_ptr<TopicManagerPrx> _defaultManager;
+    const std::map<Ice::Identity, std::shared_ptr<TopicManagerPrx>> _managers;
     std::string _commands;
     bool _continue;
     int _errors;