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

1 files changed, 3 insertions, 3 deletions

diff --git a/cpp/src/qpid/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index 72cf40caab..dc8615d58b 100644
--- a/cpp/src/qpid/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
@@ -85,11 +85,11 @@ void NullMessageStore::stage(const intrusive_ptr<PersistableMessage>&) {}
 
 void NullMessageStore::destroy(PersistableMessage&) {}
 
-void NullMessageStore::appendContent(const intrusive_ptr<const PersistableMessage>&, const string&) {}
+void NullMessageStore::appendContent(const intrusive_ptr<const PersistableMessage>&, const std::string&) {}
 
 void NullMessageStore::loadContent(const qpid::broker::PersistableQueue&,
                                    const intrusive_ptr<const PersistableMessage>&,
-                                   string&, uint64_t, uint32_t)
+                                   std::string&, uint64_t, uint32_t)
 {
     throw qpid::framing::InternalErrorException("Can't load content; persistence not enabled");
 }
@@ -139,7 +139,7 @@ void NullMessageStore::abort(TransactionContext& ctxt)
     prepared.erase(DummyCtxt::getXid(ctxt));
 }
 
-void NullMessageStore::collectPreparedXids(std::set<string>& out)
+void NullMessageStore::collectPreparedXids(std::set<std::string>& out)
 {
     out.insert(prepared.begin(), prepared.end());
 }