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 | 7ded010ea1e46465b97bdd199ad36dcd7d646e8e (patch) | |
| tree | 598533606e40c5ebd6404529be7047ace29d407e /qpid/cpp/src/qpidd.cpp | |
| parent | 66621d4049202a04b686231e0098da9951d5fd1a (diff) | |
| download | qpid-python-7ded010ea1e46465b97bdd199ad36dcd7d646e8e.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@551336 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/qpidd.cpp')
| -rw-r--r-- | qpid/cpp/src/qpidd.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp index aa84f1d6ac..28a6cf263e 100644 --- a/qpid/cpp/src/qpidd.cpp +++ b/qpid/cpp/src/qpidd.cpp @@ -57,7 +57,7 @@ struct DaemonOptions : public qpid::Options { struct QpiddOptions : public qpid::Options { DaemonOptions daemon; Broker::Options broker; - log::Options log; + qpid::log::Options log; CommonOptions common; QpiddOptions() : qpid::Options("Options") { @@ -126,7 +126,7 @@ int main(int argc, char* argv[]) try { options.parse(argc, argv, options.common.config); - log::Logger::instance().configure(options.log, argv[0]); + qpid::log::Logger::instance().configure(options.log, argv[0]); // Options that just print information. if(options.common.help || options.common.version) { |