8 files changed, 19 insertions, 17 deletions
diff --git a/cpp/src/qpid/broker/BrokerAdapter.cpp b/cpp/src/qpid/broker/BrokerAdapter.cpp
index b00c99c3bb..82378f938b 100644
--- a/cpp/src/qpid/broker/BrokerAdapter.cpp
+++ b/cpp/src/qpid/broker/BrokerAdapter.cpp
@@ -31,7 +31,7 @@ using namespace qpid::framing;
 
 typedef std::vector<Queue::shared_ptr> QueueVector;
 
-// FIXME aconway 2007-08-31: now that functionality is distributed
+// TODO aconway 2007-08-31: now that functionality is distributed
 // between different handlers, BrokerAdapter should be dropped.
 // Instead the individual class Handler interfaces can be implemented
 // by the handlers responsible for those classes.
diff --git a/cpp/src/qpid/broker/DtxManager.cpp b/cpp/src/qpid/broker/DtxManager.cpp
index 0597b41f98..7ac89d3a4e 100644
--- a/cpp/src/qpid/broker/DtxManager.cpp
+++ b/cpp/src/qpid/broker/DtxManager.cpp
@@ -31,9 +31,7 @@ using namespace qpid::framing;
 
 DtxManager::DtxManager(TransactionalStore* const _store) : store(_store) {}
 
-DtxManager::~DtxManager() {
-    // timer.stop(); // FIXME aconway 2007-10-23: leaking threads.
-}
+DtxManager::~DtxManager() {}
 
 void DtxManager::start(const std::string& xid, DtxBuffer::shared_ptr ops)
 {
diff --git a/cpp/src/qpid/broker/Message.cpp b/cpp/src/qpid/broker/Message.cpp
index c307118f20..6aa0f4c30b 100644
--- a/cpp/src/qpid/broker/Message.cpp
+++ b/cpp/src/qpid/broker/Message.cpp
@@ -165,7 +165,7 @@ void Message::sendContent(Queue& queue, framing::FrameHandler& out, uint16_t max
         for (uint64_t offset = 0; offset < expectedSize; offset += maxContentSize)
         {            
             uint64_t remaining = expectedSize - offset;
-            AMQFrame frame(0, AMQContentBody());
+            AMQFrame frame(in_place<AMQContentBody>());
             string& data = frame.castBody<AMQContentBody>()->getData();
 
             store->loadContent(queue, *this, data, offset,
@@ -196,7 +196,7 @@ void Message::sendHeader(framing::FrameHandler& out, uint16_t /*maxFrameSize*/)
     frames.map_if(f, TypeFilter<HEADER_BODY>());    
 }
 
-// FIXME aconway 2007-11-09: Obsolete, remove. Was used to cover over
+// TODO aconway 2007-11-09: Obsolete, remove. Was used to cover over
 // 0-8/0-9 message differences.
 MessageAdapter& Message::getAdapter() const
 {
diff --git a/cpp/src/qpid/broker/MessageAdapter.h b/cpp/src/qpid/broker/MessageAdapter.h
index ef316edacb..3220f304cc 100644
--- a/cpp/src/qpid/broker/MessageAdapter.h
+++ b/cpp/src/qpid/broker/MessageAdapter.h
@@ -33,7 +33,7 @@
 namespace qpid {	
 namespace broker {
 
-// FIXME aconway 2007-11-09: No longer needed, we only have one type of message.
+// TODO aconway 2007-11-09: No longer needed, we only have one type of message.
 struct MessageAdapter
 {
     virtual ~MessageAdapter() {}
diff --git a/cpp/src/qpid/broker/MessageDelivery.cpp b/cpp/src/qpid/broker/MessageDelivery.cpp
index d7f8bceae1..886008c213 100644
--- a/cpp/src/qpid/broker/MessageDelivery.cpp
+++ b/cpp/src/qpid/broker/MessageDelivery.cpp
@@ -52,8 +52,9 @@ struct BasicGetToken : BaseToken
 
     AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId id)
     {
-        return AMQFrame(0, BasicGetOkBody(
-            ProtocolVersion(), id.getValue(), msg->getRedelivered(), msg->getExchangeName(),
+        return AMQFrame(in_place<BasicGetOkBody>(
+            ProtocolVersion(), id.getValue(),
+            msg->getRedelivered(), msg->getExchangeName(),
             msg->getRoutingKey(), queue->getMessageCount())); 
     }
 };
@@ -68,9 +69,10 @@ struct BasicConsumeToken : BaseToken
 
     AMQFrame sendMethod(intrusive_ptr<Message> msg, DeliveryId id)
     {
-        return AMQFrame(0, BasicDeliverBody(
+        return AMQFrame(in_place<BasicDeliverBody>(
             ProtocolVersion(), consumer, id.getValue(),
-            msg->getRedelivered(), msg->getExchangeName(), msg->getRoutingKey()));
+            msg->getRedelivered(), msg->getExchangeName(),
+            msg->getRoutingKey()));
     }
 
 };
@@ -90,7 +92,9 @@ struct MessageDeliveryToken : BaseToken
         if (msg->getRedelivered()){
             msg->getProperties<DeliveryProperties>()->setRedelivered(true);
         }
-        return AMQFrame(0, MessageTransferBody(ProtocolVersion(), 0, destination, confirmMode, acquireMode));
+        return AMQFrame(in_place<MessageTransferBody>(
+                            ProtocolVersion(), 0, destination,
+                            confirmMode, acquireMode));
     }
 };
 
diff --git a/cpp/src/qpid/broker/SemanticHandler.h b/cpp/src/qpid/broker/SemanticHandler.h
index 8b27bc53c3..1afcdaab76 100644
--- a/cpp/src/qpid/broker/SemanticHandler.h
+++ b/cpp/src/qpid/broker/SemanticHandler.h
@@ -57,7 +57,7 @@ class SemanticHandler : public DeliveryAdapter,
 
     SemanticState state;
     SessionState& session;
-    // FIXME aconway 2007-09-20: Why are these on the handler rather than the
+    // TODO aconway 2007-09-20: Why are these on the handler rather than the
     // state?
     IncomingExecutionContext incoming;
     framing::Window outgoing;
diff --git a/cpp/src/qpid/broker/SessionHandler.cpp b/cpp/src/qpid/broker/SessionHandler.cpp
index b05e22c7bc..a142af2e1a 100644
--- a/cpp/src/qpid/broker/SessionHandler.cpp
+++ b/cpp/src/qpid/broker/SessionHandler.cpp
@@ -124,13 +124,13 @@ void  SessionHandler::resume(const Uuid& id) {
 
 void  SessionHandler::flow(bool /*active*/) {
     assertAttached("flow");
-    // FIXME aconway 2007-09-19: Removed in 0-10, remove 
+    // TODO aconway 2007-09-19: Removed in 0-10, remove 
     assert(0); throw NotImplementedException("session.flow");
 }
 
 void  SessionHandler::flowOk(bool /*active*/) {
     assertAttached("flowOk");
-    // FIXME aconway 2007-09-19: Removed in 0-10, remove 
+    // TODO aconway 2007-09-19: Removed in 0-10, remove 
     assert(0); throw NotImplementedException("session.flowOk");
 }
 
@@ -181,7 +181,7 @@ void  SessionHandler::ack(uint32_t     cumulativeSeenMark,
 }
 
 void  SessionHandler::highWaterMark(uint32_t /*lastSentMark*/) {
-    // FIXME aconway 2007-10-02: may be removed from spec.
+    // TODO aconway 2007-10-02: may be removed from spec.
     assert(0); throw NotImplementedException("session.high-water-mark");
 }
 
diff --git a/cpp/src/qpid/broker/SessionState.cpp b/cpp/src/qpid/broker/SessionState.cpp
index d5b6f5ba8a..ebf02a8306 100644
--- a/cpp/src/qpid/broker/SessionState.cpp
+++ b/cpp/src/qpid/broker/SessionState.cpp
@@ -46,7 +46,7 @@ SessionState::SessionState(
       version(h.getConnection().getVersion()),
       semanticHandler(new SemanticHandler(*this))
 {
-    // FIXME aconway 2007-09-20: SessionManager may add plugin
+    // TODO aconway 2007-09-20: SessionManager may add plugin
     // handlers to the chain.
  }