From 23204010207ad7db58500b6547b92b7f91d2df53 Mon Sep 17 00:00:00 2001 From: Alan Conway Date: Thu, 14 Oct 2010 19:38:40 +0000 Subject: Code cleanup in broker directory. - Removed un-necessary #includes for broker/Queue.h - Removed "using std::string" in header files. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1022679 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/replication/ReplicationExchange.cpp | 2 ++ cpp/src/qpid/replication/ReplicationExchange.h | 11 ++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/replication') diff --git a/cpp/src/qpid/replication/ReplicationExchange.cpp b/cpp/src/qpid/replication/ReplicationExchange.cpp index b5911bb71e..4b6d25ac7d 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.cpp +++ b/cpp/src/qpid/replication/ReplicationExchange.cpp @@ -22,6 +22,8 @@ #include "qpid/replication/constants.h" #include "qpid/Plugin.h" #include "qpid/broker/Broker.h" +#include "qpid/broker/Queue.h" +#include "qpid/broker/QueueRegistry.h" #include "qpid/broker/ExchangeRegistry.h" #include "qpid/framing/reply_exceptions.h" #include "qpid/log/Statement.h" diff --git a/cpp/src/qpid/replication/ReplicationExchange.h b/cpp/src/qpid/replication/ReplicationExchange.h index f0252448f9..4b34e0df13 100644 --- a/cpp/src/qpid/replication/ReplicationExchange.h +++ b/cpp/src/qpid/replication/ReplicationExchange.h @@ -26,6 +26,11 @@ #include "qpid/framing/SequenceNumber.h" namespace qpid { + +namespace broker { +class QueueRegistry; +} + namespace replication { /** @@ -49,9 +54,9 @@ class ReplicationExchange : public qpid::broker::Exchange void route(qpid::broker::Deliverable& msg, const std::string& routingKey, const qpid::framing::FieldTable* args); - bool bind(qpid::broker::Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); - bool unbind(qpid::broker::Queue::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); - bool isBound(qpid::broker::Queue::shared_ptr queue, const std::string* const routingKey, const qpid::framing::FieldTable* const args); + bool bind(boost::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + bool unbind(boost::shared_ptr queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + bool isBound(boost::shared_ptr queue, const std::string* const routingKey, const qpid::framing::FieldTable* const args); private: qpid::broker::QueueRegistry& queues; qpid::framing::SequenceNumber sequence; -- cgit v1.2.1