Author: aconway
Date: Fri Sep 19 05:55:15 2008
New Revision: 697075
URL: http://svn.apache.org/viewvc?rev=697075&view=rev
Log:
Clean up unused members/tests
qpid/broker/SemanticState.h,.cpp,SessionState.h: removed unused members.
tests/DumpClientTest.cpp: unused, remove.
Removed:
incubator/qpid/trunk/qpid/cpp/src/tests/DumpClientTest.cpp
Modified:
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h?rev=697075&r1=697074&r2=697075&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SemanticState.h Fri Sep 19
05:55:15 2008
@@ -114,7 +114,6 @@
SessionContext& session;
DeliveryAdapter& deliveryAdapter;
- Queue::shared_ptr defaultQueue;
ConsumerImplMap consumers;
uint32_t prefetchSize;
uint16_t prefetchCount;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp?rev=697075&r1=697074&r2=697075&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.cpp Fri Sep 19
05:55:15 2008
@@ -50,7 +50,6 @@
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 @@
} else {
getProxy().getExecution().exception(e.code, commandId, 0, 0, 0,
e.what(), FieldTable());
}
- ignoring = true;
handler->sendDetach();
}
}
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h?rev=697075&r1=697074&r2=697075&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/broker/SessionState.h Fri Sep 19
05:55:15 2008
@@ -116,7 +116,6 @@
Broker& broker;
SessionHandler* handler;
sys::AbsTime expiry; // Used by SessionManager.
- bool ignoring;
SemanticState semanticState;
SessionAdapter adapter;
MessageBuilder msgBuilder;
Modified: incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h?rev=697075&r1=697074&r2=697075&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h (original)
+++ incubator/qpid/trunk/qpid/cpp/src/qpid/cluster/Cluster.h Fri Sep 19
05:55:15 2008
@@ -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 @@
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;
Modified: incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk?rev=697075&r1=697074&r2=697075&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk (original)
+++ incubator/qpid/trunk/qpid/cpp/src/tests/cluster.mk Fri Sep 19 05:55:15 2008
@@ -19,6 +19,5 @@
cluster_test_LDADD=$(lib_client) $(lib_cluster) -lboost_unit_test_framework
unit_test_LDADD+=$(lib_cluster)
-unit_test_SOURCES+=DumpClientTest.cpp
endif
