4 files changed, 9 insertions, 22 deletions
diff --git a/cpp/lib/broker/BrokerMessage.cpp b/cpp/lib/broker/BrokerMessage.cpp
index 91ba3dfec0..fc61cd2296 100644
--- a/cpp/lib/broker/BrokerMessage.cpp
+++ b/cpp/lib/broker/BrokerMessage.cpp
@@ -49,14 +49,6 @@ BasicMessage::BasicMessage(
     size(0)
 {}
 
-// FIXME aconway 2007-02-01: remove.
-// BasicMessage::BasicMessage(Buffer& buffer, bool headersOnly, uint32_t contentChunkSize) : 
-//     publisher(0), size(0)
-// {
-
-//     decode(buffer, headersOnly, contentChunkSize);
-// }
-
 // For tests only.
 BasicMessage::BasicMessage() : size(0)
 {}
@@ -227,12 +219,13 @@ void BasicMessage::releaseContent(MessageStore* store)
         store->stage(this);
     }
     if (!content.get() || content->size() > 0) {
-        // FIXME aconway 2007-02-07: handle MessageMessage.
-        //set content to lazy loading mode (but only if there is stored content):
+        //set content to lazy loading mode (but only if there is
+        //stored content):
 
-        //Note: the LazyLoadedContent instance contains a raw pointer to the message, however it is
-        //      then set as a member of that message so its lifetime is guaranteed to be no longer than
-        //      that of the message itself
+        //Note: the LazyLoadedContent instance contains a raw pointer
+        //to the message, however it is then set as a member of that
+        //message so its lifetime is guaranteed to be no longer than
+        //that of the message itself
         content = std::auto_ptr<Content>(
             new LazyLoadedContent(store, this, expectedContentSize()));
     }
diff --git a/cpp/lib/broker/BrokerMessageBase.h b/cpp/lib/broker/BrokerMessageBase.h
index 7739ab19e0..4989cccdd3 100644
--- a/cpp/lib/broker/BrokerMessageBase.h
+++ b/cpp/lib/broker/BrokerMessageBase.h
@@ -110,10 +110,6 @@ class Message {
     virtual bool isComplete() = 0;
             
     virtual uint64_t contentSize() const = 0;
-    // FIXME aconway 2007-02-06: Get rid of BasicHeaderProperties
-    // at this level. Expose only generic properties available from both
-    // message types (e.g. getApplicationHeaders below).
-    // 
     virtual framing::BasicHeaderProperties* getHeaderProperties() = 0;
     virtual const framing::FieldTable& getApplicationHeaders() = 0;
     virtual bool isPersistent() = 0;
diff --git a/cpp/lib/broker/BrokerQueue.cpp b/cpp/lib/broker/BrokerQueue.cpp
index 31309bd6c5..b65e8e3a9a 100644
--- a/cpp/lib/broker/BrokerQueue.cpp
+++ b/cpp/lib/broker/BrokerQueue.cpp
@@ -234,10 +234,9 @@ void Queue::create(const FieldTable& settings)
 
 void Queue::configure(const FieldTable& settings)
 {
-    QueuePolicy* _policy = new QueuePolicy(settings);
-    if (_policy->getMaxCount() || _policy->getMaxSize()) {
-        setPolicy(std::auto_ptr<QueuePolicy>(_policy));
-    }
+    std::auto_ptr<QueuePolicy> _policy(new QueuePolicy(settings));
+    if (_policy->getMaxCount() || _policy->getMaxSize()) 
+        setPolicy(_policy);
 }
 
 void Queue::destroy()
diff --git a/cpp/lib/broker/InMemoryContent.cpp b/cpp/lib/broker/InMemoryContent.cpp
index 3e4ac29486..237375e860 100644
--- a/cpp/lib/broker/InMemoryContent.cpp
+++ b/cpp/lib/broker/InMemoryContent.cpp
@@ -40,7 +40,6 @@ uint32_t InMemoryContent::size()
     return sum;
 }
 
-// FIXME aconway 2007-02-01: Remove version parameter.
 void InMemoryContent::send(ChannelAdapter& channel, uint32_t framesize)
 {
     for (content_iterator i = content.begin(); i != content.end(); i++) {