src/qpid/framing/Visitor.h:

 - Removed depdency on Handler, Visitor is a separate pattern.
 - QPID_VISITOR macro to generate visitor classes replaces use of mpl
   (Default limits on mpl::vector (20) is too low, concenred about
   compile time problems if raised to 150.


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

1 files changed, 8 insertions, 8 deletions

diff --git a/qpid/cpp/src/tests/Visitor.cpp b/qpid/cpp/src/tests/Visitor.cpp
index f491624cf8..0cb3cf15bb 100644
--- a/qpid/cpp/src/tests/Visitor.cpp
+++ b/qpid/cpp/src/tests/Visitor.cpp
@@ -29,19 +29,19 @@ struct DummyA;
 struct DummyB;
 struct DummyC;
 
-typedef HandlerVisitor<boost::mpl::vector<DummyA&, DummyB&, DummyC&> > DummyVisitor;
+QPID_VISITOR(DummyVisitor, (DummyA)(DummyB)(DummyC));
 
-struct DummyFrame : public AbstractVisitable<DummyVisitor> {};
+struct DummyFrame : public VisitableRoot<DummyVisitor> {};
 
-struct DummyA : public ConcreteVisitable<DummyA&, DummyFrame> {};
-struct DummyB : public ConcreteVisitable<DummyB&, DummyFrame> {};
-struct DummyC : public ConcreteVisitable<DummyC&, DummyFrame> {};
+struct DummyA : public Visitable<DummyA, DummyFrame> {};
+struct DummyB : public Visitable<DummyB, DummyFrame> {};
+struct DummyC : public Visitable<DummyC, DummyFrame> {};
 
 struct TestDummyVisitor : public DummyVisitor {
     boost::tuple<DummyA*, DummyB*, DummyC*> dummies;
-    void handle(DummyA& a) { dummies.get<0>() = &a; }
-    void handle(DummyB& b) { dummies.get<1>() = &b; }
-    void handle(DummyC& c) { dummies.get<2>() = &c; }
+    void visit(DummyA& a) { dummies.get<0>() = &a; }
+    void visit(DummyB& b) { dummies.get<1>() = &b; }
+    void visit(DummyC& c) { dummies.get<2>() = &c; }
 };
 
 BOOST_AUTO_TEST_CASE(Visitor_accept) {