- Update cluster code to work with new FrameHandler

 - Update ClassifierHandler to  use Visitor rather than map.
 - Replace heap allocation in cluster classes with boost::optional.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@571246 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 7 deletions

diff --git a/cpp/src/qpid/cluster/ClassifierHandler.h b/cpp/src/qpid/cluster/ClassifierHandler.h
index 8c2f4ef85f..696e457c04 100644
--- a/cpp/src/qpid/cluster/ClassifierHandler.h
+++ b/cpp/src/qpid/cluster/ClassifierHandler.h
@@ -20,9 +20,6 @@
  */
 
 #include "qpid/framing/FrameHandler.h"
-#include "qpid/framing/amqp_types.h"
-
-#include <map>
 
 namespace qpid {
 namespace cluster {
@@ -33,12 +30,17 @@ namespace cluster {
 class ClassifierHandler : public framing::FrameHandler
 {
   public:
-    ClassifierHandler(Chain wiring, Chain other);
-
-    void handle(framing::AMQFrame& frame);
+    ClassifierHandler(framing::FrameHandler& wiring_,
+                      framing::FrameHandler& other_)
+        : wiring(wiring_), other(other_) {}
 
+    void handle(framing::AMQFrame&);
+    
   private:
-    std::map<uint32_t, framing::FrameHandler::Chain> map;
+    struct Visitor;
+  friend struct Visitor;
+    framing::FrameHandler& wiring;
+    framing::FrameHandler& other;
 };
 
 }} // namespace qpid::cluster