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/xml/XmlExchange.cpp | 1 + cpp/src/qpid/xml/XmlExchange.h | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/xml') diff --git a/cpp/src/qpid/xml/XmlExchange.cpp b/cpp/src/qpid/xml/XmlExchange.cpp index fbf7566a18..f0afc8d451 100644 --- a/cpp/src/qpid/xml/XmlExchange.cpp +++ b/cpp/src/qpid/xml/XmlExchange.cpp @@ -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 { diff --git a/cpp/src/qpid/xml/XmlExchange.h b/cpp/src/qpid/xml/XmlExchange.h index 4394ede5e7..f34c417633 100644 --- a/cpp/src/qpid/xml/XmlExchange.h +++ b/cpp/src/qpid/xml/XmlExchange.h @@ -57,7 +57,7 @@ class XmlExchange : public virtual Exchange { }; - typedef std::map XmlBindingsMap; + typedef std::map XmlBindingsMap; XmlBindingsMap bindingsMap; XQilla xqilla; @@ -69,7 +69,7 @@ class XmlExchange : public virtual Exchange { 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 Exchange { 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(); }; -- cgit v1.2.1