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, 17 insertions, 18 deletions

diff --git a/cpp/src/qpid/broker/RecoveredEnqueue.h b/cpp/src/qpid/broker/RecoveredEnqueue.h
index 09f928f098..5f718001d5 100644
--- a/cpp/src/qpid/broker/RecoveredEnqueue.h
+++ b/cpp/src/qpid/broker/RecoveredEnqueue.h
@@ -24,7 +24,6 @@
 #include "qpid/broker/Deliverable.h"
 #include "qpid/broker/Message.h"
 #include "qpid/broker/MessageStore.h"
-#include "qpid/broker/Queue.h"
 #include "qpid/broker/TxOp.h"
 
 #include <boost/intrusive_ptr.hpp>
@@ -34,24 +33,24 @@
 #include <list>
 
 namespace qpid {
-    namespace broker {
-        class RecoveredEnqueue : public TxOp{
-            Queue::shared_ptr queue;
-            boost::intrusive_ptr<Message> msg;
-
-        public:
-            RecoveredEnqueue(Queue::shared_ptr queue, boost::intrusive_ptr<Message> msg);
-            virtual bool prepare(TransactionContext* ctxt) throw();
-            virtual void commit() throw();
-            virtual void rollback() throw();
-            virtual ~RecoveredEnqueue(){}
-            virtual void accept(TxOpConstVisitor& visitor) const { visitor(*this); }
-
-            Queue::shared_ptr getQueue() const { return queue; }
-            boost::intrusive_ptr<Message> getMessage() const { return msg; }
+namespace broker {
+class RecoveredEnqueue : public TxOp{
+    boost::shared_ptr<Queue> queue;
+    boost::intrusive_ptr<Message> msg;
+
+  public:
+    RecoveredEnqueue(boost::shared_ptr<Queue> queue, boost::intrusive_ptr<Message> msg);
+    virtual bool prepare(TransactionContext* ctxt) throw();
+    virtual void commit() throw();
+    virtual void rollback() throw();
+    virtual ~RecoveredEnqueue(){}
+    virtual void accept(TxOpConstVisitor& visitor) const { visitor(*this); }
+
+    boost::shared_ptr<Queue> getQueue() const { return queue; }
+    boost::intrusive_ptr<Message> getMessage() const { return msg; }
             
-        };
-    }
+};
+}
 }