diff options
author | Alan Conway <aconway@apache.org> | 2007-06-27 21:19:14 +0000 |
---|---|---|
committer | Alan Conway <aconway@apache.org> | 2007-06-27 21:19:14 +0000 |
commit | 0efcf2c5c91f4927ccc00ad1cf391c2f964cc2e1 (patch) | |
tree | a9318ac4787cf588dd1329c2e557d8f870be20cc /cpp/src/tests/BrokerChannelTest.cpp | |
parent | 548abd065f91bc1f238ac98c24edf410edf10356 (diff) | |
download | qpid-python-0efcf2c5c91f4927ccc00ad1cf391c2f964cc2e1.tar.gz |
* src/qpid/framing/ChannelAdapter.cpp: Use handler chains
for in and outbound frames.
* src/qpid/framing/InputHandler.h, OutputHandler.h, FrameHandler.h:
All handlers pass AMQFrame& and have consistent memory management.
Terminal OutputHandlers used to take ownership and delete frame, now
they make a shallow copy instead.
* src/qpid/framing/Handler.h, FrameHandler.h: Simplified.
* src/qpid/client/ClientConnection.cpp:
* src/qpid/broker/Connection.cpp:
* src/qpid/broker/BrokerChannel.cpp:
Update for ChannelAdapter changes.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@551336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/tests/BrokerChannelTest.cpp')
-rw-r--r-- | cpp/src/tests/BrokerChannelTest.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp index 19841dc18d..9dee1fc862 100644 --- a/cpp/src/tests/BrokerChannelTest.cpp +++ b/cpp/src/tests/BrokerChannelTest.cpp @@ -31,7 +31,7 @@ #include "MockChannel.h" #include "qpid/broker/Connection.h" #include "qpid/framing/ProtocolInitiation.h" -#include <boost/ptr_container/ptr_vector.hpp> +#include <vector> using namespace boost; using namespace qpid::broker; @@ -41,9 +41,9 @@ using std::string; using std::queue; struct MockHandler : ConnectionOutputHandler{ - boost::ptr_vector<AMQFrame> frames; + std::vector<AMQFrame> frames; - void send(AMQFrame* frame){ frames.push_back(frame); } + void send(AMQFrame& frame){ frames.push_back(frame); } void close() {}; }; |