Modified: qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.h?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/management/ManagementTopicExchange.h Thu Oct 14 19:38:40 2010 @@ -36,19 +36,19 @@ class ManagementTopicExchange : public v public: static const std::string typeName; - ManagementTopicExchange(const string& name, Manageable* _parent = 0, Broker* broker = 0); - ManagementTopicExchange(const string& _name, bool _durable, + ManagementTopicExchange(const std::string& name, Manageable* _parent = 0, Broker* broker = 0); + ManagementTopicExchange(const std::string& _name, bool _durable, const qpid::framing::FieldTable& _args, Manageable* _parent = 0, Broker* broker = 0); virtual std::string getType() const { return typeName; } virtual void route(Deliverable& msg, - const string& routingKey, + const std::string& routingKey, const qpid::framing::FieldTable* args); virtual bool bind(Queue::shared_ptr queue, - const string& routingKey, + const std::string& routingKey, const qpid::framing::FieldTable* args); void setManagmentAgent(management::ManagementAgent* agent, int qmfVersion);
Modified: qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.cpp Thu Oct 14 19:38:40 2010 @@ -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" Modified: qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.h?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/replication/ReplicationExchange.h Thu Oct 14 19:38:40 2010 @@ -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: 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<broker::Queue> queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + bool unbind(boost::shared_ptr<broker::Queue> queue, const std::string& routingKey, const qpid::framing::FieldTable* args); + bool isBound(boost::shared_ptr<broker::Queue> queue, const std::string* const routingKey, const qpid::framing::FieldTable* const args); private: qpid::broker::QueueRegistry& queues; qpid::framing::SequenceNumber sequence; Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp (original) +++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.cpp Thu Oct 14 19:38:40 2010 @@ -49,6 +49,7 @@ using namespace qpid::framing; using namespace qpid::sys; using qpid::management::Manageable; +using std::string; namespace _qmf = qmf::org::apache::qpid::broker; namespace qpid { Modified: qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.h URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.h?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.h (original) +++ qpid/trunk/qpid/cpp/src/qpid/xml/XmlExchange.h Thu Oct 14 19:38:40 2010 @@ -57,7 +57,7 @@ class XmlExchange : public virtual Excha }; - typedef std::map<string, XmlBinding::vector > XmlBindingsMap; + typedef std::map<std::string, XmlBinding::vector > XmlBindingsMap; XmlBindingsMap bindingsMap; XQilla xqilla; @@ -69,7 +69,7 @@ class XmlExchange : public virtual Excha static const std::string typeName; XmlExchange(const std::string& name, management::Manageable* parent = 0, Broker* broker = 0); - XmlExchange(const string& _name, bool _durable, + XmlExchange(const std::string& _name, bool _durable, const qpid::framing::FieldTable& _args, management::Manageable* parent = 0, Broker* broker = 0); virtual std::string getType() const { return typeName; } @@ -80,7 +80,7 @@ class XmlExchange : public virtual Excha virtual void route(Deliverable& msg, const std::string& routingKey, const qpid::framing::FieldTable* args); - virtual bool isBound(Queue::shared_ptr queue, const string* const routingKey, const qpid::framing::FieldTable* const args); + virtual bool isBound(Queue::shared_ptr queue, const std::string* const routingKey, const qpid::framing::FieldTable* const args); virtual ~XmlExchange(); }; Modified: qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp (original) +++ qpid/trunk/qpid/cpp/src/tests/DeliveryRecordTest.cpp Thu Oct 14 19:38:40 2010 @@ -20,6 +20,7 @@ * */ #include "qpid/broker/DeliveryRecord.h" +#include "qpid/broker/Queue.h" #include "unit_test.h" #include <iostream> #include <memory> Modified: qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp?rev=1022679&r1=1022678&r2=1022679&view=diff ============================================================================== --- qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp (original) +++ qpid/trunk/qpid/cpp/src/tests/QueueRegistryTest.cpp Thu Oct 14 19:38:40 2010 @@ -18,6 +18,7 @@ */ #include "qpid/broker/QueueRegistry.h" +#include "qpid/broker/Queue.h" #include "unit_test.h" #include <string> --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org
