diff options
| author | Alan Conway <aconway@apache.org> | 2008-09-19 12:55:15 +0000 |
|---|---|---|
| committer | Alan Conway <aconway@apache.org> | 2008-09-19 12:55:15 +0000 |
| commit | 85021877a773ca361d90ebfce5d9ff0994d50378 (patch) | |
| tree | e8c851e8ec3a408d7d119fee85a47040a7d6667e /cpp/src/qpid | |
| parent | 24a755709c9a28500c1e6c21905854eb970dad00 (diff) | |
| download | qpid-python-85021877a773ca361d90ebfce5d9ff0994d50378.tar.gz | |
Clean up unused members/tests
qpid/broker/SemanticState.h,.cpp,SessionState.h: removed unused members.
tests/DumpClientTest.cpp: unused, remove.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@697075 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid')
| -rw-r--r-- | cpp/src/qpid/broker/SemanticState.h | 1 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SessionState.cpp | 2 | ||||
| -rw-r--r-- | cpp/src/qpid/broker/SessionState.h | 1 | ||||
| -rw-r--r-- | cpp/src/qpid/cluster/Cluster.h | 8 |
4 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/qpid/broker/SemanticState.h b/cpp/src/qpid/broker/SemanticState.h index 1d32d8aa50..e2dd4af95b 100644 --- a/cpp/src/qpid/broker/SemanticState.h +++ b/cpp/src/qpid/broker/SemanticState.h @@ -114,7 +114,6 @@ class SemanticState : public sys::OutputTask, SessionContext& session; DeliveryAdapter& deliveryAdapter; - Queue::shared_ptr defaultQueue; ConsumerImplMap consumers; uint32_t prefetchSize; uint16_t prefetchCount; diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp index d0e75849d8..6358bd2145 100644 --- a/cpp/src/qpid/broker/SessionState.cpp +++ b/cpp/src/qpid/broker/SessionState.cpp @@ -50,7 +50,6 @@ SessionState::SessionState( Broker& b, SessionHandler& h, const SessionId& id, const SessionState::Configuration& config) : qpid::SessionState(id, config), broker(b), handler(&h), - ignoring(false), semanticState(*this, *this), adapter(semanticState), msgBuilder(&broker.getStore(), broker.getStagingThreshold()), @@ -237,7 +236,6 @@ void SessionState::handleIn(AMQFrame& frame) { } else { getProxy().getExecution().exception(e.code, commandId, 0, 0, 0, e.what(), FieldTable()); } - ignoring = true; handler->sendDetach(); } } diff --git a/cpp/src/qpid/broker/SessionState.h b/cpp/src/qpid/broker/SessionState.h index e424559228..5dd57d2299 100644 --- a/cpp/src/qpid/broker/SessionState.h +++ b/cpp/src/qpid/broker/SessionState.h @@ -116,7 +116,6 @@ class SessionState : public qpid::SessionState, Broker& broker; SessionHandler* handler; sys::AbsTime expiry; // Used by SessionManager. - bool ignoring; SemanticState semanticState; SessionAdapter adapter; MessageBuilder msgBuilder; diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h index aa077ef63c..c63e2e3e58 100644 --- a/cpp/src/qpid/cluster/Cluster.h +++ b/cpp/src/qpid/cluster/Cluster.h @@ -34,8 +34,11 @@ #include "qmf/org/apache/qpid/cluster/Cluster.h" #include <boost/intrusive_ptr.hpp> +#include <boost/bind.hpp> +#include <algorithm> #include <vector> +#include <map> namespace qpid { namespace cluster { @@ -93,6 +96,11 @@ class Cluster : private Cpg::Handler, public management::Manageable broker::Broker& getBroker(); void setDumpComplete(); + + template <class F> void eachConnection(const F& f) { + std::for_each(connections.begin(), connections.end(), + boost::bind(f, boost::bind(&ConnectionMap::value_type::second, _1))); + } private: typedef std::map<ConnectionId, boost::intrusive_ptr<cluster::Connection> > ConnectionMap; |
