You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ac...@apache.org on 2007/08/27 23:38:41 UTC
svn commit: r570251 - in /incubator/qpid/trunk/qpid/cpp/src: Makefile.am
qpid/broker/SessionAdapter.h qpid/framing/FrameDefaultVisitor.h
Author: aconway
Date: Mon Aug 27 14:38:40 2007
New Revision: 570251
URL: http://svn.apache.org/viewvc?rev=570251&view=rev
Log:
* Fix compile errors.
Modified:
incubator/qpid/trunk/qpid/cpp/src/Makefile.am
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h
incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
Modified: incubator/qpid/trunk/qpid/cpp/src/Makefile.am
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/Makefile.am?rev=570251&r1=570250&r2=570251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/Makefile.am (original)
+++ incubator/qpid/trunk/qpid/cpp/src/Makefile.am Mon Aug 27 14:38:40 2007
@@ -195,8 +195,6 @@
qpid/broker/SessionState.h \
qpid/broker/SuspendedSessions.h \
qpid/broker/SuspendedSessions.cpp \
- qpid/broker/SessionAdapter.h \
- qpid/broker/SessionAdapter.cpp \
qpid/broker/SemanticHandler.cpp \
qpid/broker/Timer.cpp \
qpid/broker/TopicExchange.cpp \
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h?rev=570251&r1=570250&r2=570251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionAdapter.h Mon Aug 27 14:38:40 2007
@@ -34,32 +34,35 @@
* Implements AMQP session class commands, forwards other traffic
* to the next handler in the chain.
*/
-class SessionAdapter : public FrameVisitorHandler
-
+class SessionAdapter : public framing::FrameVisitorHandler
{
public:
- SessionAdapter(FrameHandler& out, SuspendedSessions&);
+ SessionAdapter(framing::FrameHandler& out, SuspendedSessions&);
~SessionAdapter();
protected:
- void visit(const SessionAckBody&);
- void visit(const SessionAttachedBody&);
- void visit(const SessionCloseBody&);
- void visit(const SessionClosedBody&);
- void visit(const SessionDetachedBody&);
- void visit(const SessionFlowBody&);
- void visit(const SessionFlowOkBody&);
- void visit(const SessionHighWaterMarkBody&);
- void visit(const SessionOpenBody&);
- void visit(const SessionResumeBody&);
- void visit(const SessionSolicitAckBody&);
- void visit(const SessionSuspendBody&);
+ void visit(const framing::SessionAckBody&);
+ void visit(const framing::SessionAttachedBody&);
+ void visit(const framing::SessionCloseBody&);
+ void visit(const framing::SessionClosedBody&);
+ void visit(const framing::SessionDetachedBody&);
+ void visit(const framing::SessionFlowBody&);
+ void visit(const framing::SessionFlowOkBody&);
+ void visit(const framing::SessionHighWaterMarkBody&);
+ void visit(const framing::SessionOpenBody&);
+ void visit(const framing::SessionResumeBody&);
+ void visit(const framing::SessionSolicitAckBody&);
+ void visit(const framing::SessionSuspendBody&);
+ using FrameDefaultVisitor::visit;
+
private:
SessionState state;
SuspendedSessions& suspended;
Chain next;
- FrameHandler& out;
+ framing::FrameHandler& out;
+};
+
}} // namespace qpid::broker
#endif /*!QPID_BROKER_SESSIONADAPTER_H*/
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h?rev=570251&r1=570250&r2=570251&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/framing/FrameDefaultVisitor.h Mon Aug 27 14:38:40 2007
@@ -23,12 +23,13 @@
#include "qpid/framing/MethodBodyDefaultVisitor.h"
#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQFrame.h"
#include "qpid/framing/FrameHandler.h"
namespace qpid {
namespace framing {
-class AMQMethodBody;
class AMQHeaderBody;
class AMQContentBody;
class AMQHeartbeatBody;
@@ -44,23 +45,26 @@
*/
struct FrameDefaultVisitor : public AMQBodyConstVisitor, public MethodBodyDefaultVisitor
{
- void visit(const AMQHeaderBody& x) { defaultVisit(); }
- void visit(const AMQContentBody& x) { defaultVisit(); }
- void visit(const AMQHeartbeatBody& x) { defaultVisit(); }
- void visit(const AMQMethodBody& method) { method.accept(*this); }
+ void visit(const AMQHeaderBody&) { defaultVisit(); }
+ void visit(const AMQContentBody&) { defaultVisit(); }
+ void visit(const AMQHeartbeatBody&) { defaultVisit(); }
+ void visit(const AMQMethodBody& method) { method.accept(static_cast<MethodBodyDefaultVisitor&>(*this)); }
+
+ using AMQBodyConstVisitor::visit;
+ using MethodBodyDefaultVisitor::visit;
};
/**
* A FrameHandler that is implemented as a visitor.
*/
struct FrameVisitorHandler : public FrameHandler,
- protected FrameVisitorHandler
+ protected FrameDefaultVisitor
{
- void handle(AMQFrame& f) { f.accept(*this); }
+ void handle(AMQFrame& f) { f.getBody()->accept(*this); }
};
-
+}} // namespace qpid::framing
#endif /*!QPID_FRAMING_FRAMEVISITOR_H*/