4 files changed, 8 insertions, 8 deletions
diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h
index 2318492e2d..5a8e55f9d2 100644
--- a/cpp/src/qpid/framing/AMQFrame.h
+++ b/cpp/src/qpid/framing/AMQFrame.h
@@ -105,7 +105,6 @@ class AMQFrame : public AMQDataBlock
     void setEos(bool isEos) { eos = isEos; }
 
     static uint32_t frameOverhead();
-
   private:
     void init() { bof = eof = bos = eos = true; subchannel=0; channel=0; }
 
diff --git a/cpp/src/qpid/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h
index 8a3a92936e..2064468785 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.h
+++ b/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -26,8 +26,8 @@
 #include "Buffer.h"
 #include "qpid/framing/DeliveryProperties.h"
 #include "qpid/framing/MessageProperties.h"
-#include "qpid/framing/DeliveryProperties010.h"
-#include "qpid/framing/MessageProperties010.h"
+#include "qpid/framing/PreviewDeliveryProperties.h"
+#include "qpid/framing/PreviewMessageProperties.h"
 #include <iostream>
 
 #include <boost/optional.hpp>
@@ -79,8 +79,8 @@ class AMQHeaderBody :  public AMQBody
     // Could use boost::mpl::fold to construct a larger set.
     typedef  PropSet< PropSet< PropSet<PropSet<Empty, DeliveryProperties>, 
                                        MessageProperties>, 
-                               DeliveryProperties010>, 
-                      MessageProperties010> Properties;
+                               PreviewDeliveryProperties>, 
+                      PreviewMessageProperties> Properties;
 
     Properties properties;
     
diff --git a/cpp/src/qpid/framing/AMQP_HighestVersion.h b/cpp/src/qpid/framing/AMQP_HighestVersion.h
index b15e14d6f6..0aa1bf7e66 100644
--- a/cpp/src/qpid/framing/AMQP_HighestVersion.h
+++ b/cpp/src/qpid/framing/AMQP_HighestVersion.h
@@ -32,8 +32,8 @@
 namespace qpid {
 namespace framing {
 
-static ProtocolVersion highestProtocolVersion(99, 0);
-//static ProtocolVersion highestProtocolVersion(0, 10);
+//static ProtocolVersion highestProtocolVersion(99, 0);
+static ProtocolVersion highestProtocolVersion(0, 10);
 
 } /* namespace framing */
 } /* namespace qpid */
diff --git a/cpp/src/qpid/framing/SequenceSet.h b/cpp/src/qpid/framing/SequenceSet.h
index eabc729411..8b3d6b3f28 100644
--- a/cpp/src/qpid/framing/SequenceSet.h
+++ b/cpp/src/qpid/framing/SequenceSet.h
@@ -69,11 +69,12 @@ class SequenceSet {
     bool empty() const;
 
     template <class T>
-    void for_each(T& t) const
+    T for_each(T& t) const
     {
         for (Ranges::const_iterator i = ranges.begin(); i != ranges.end(); i++) {
             t(i->start, i->end);
         }
+        return t;
     }
 
     template <class S> void serialize(S& s) { s.split(*this); s(ranges.begin(), ranges.end()); }