3 files changed, 5 insertions, 5 deletions
diff --git a/cpp/src/qpid/framing/FrameSet.cpp b/cpp/src/qpid/framing/FrameSet.cpp
index 0e1c9da922..e6f15f2c4e 100644
--- a/cpp/src/qpid/framing/FrameSet.cpp
+++ b/cpp/src/qpid/framing/FrameSet.cpp
@@ -30,7 +30,7 @@ using namespace boost;
 
 FrameSet::FrameSet(const SequenceNumber& _id) : id(_id) {parts.reserve(4);}
 
-void FrameSet::append(AMQFrame& part)
+void FrameSet::append(const AMQFrame& part)
 {
     parts.push_back(part);
 }
diff --git a/cpp/src/qpid/framing/FrameSet.h b/cpp/src/qpid/framing/FrameSet.h
index 8ba22f07cb..454d292d9d 100644
--- a/cpp/src/qpid/framing/FrameSet.h
+++ b/cpp/src/qpid/framing/FrameSet.h
@@ -43,7 +43,7 @@ public:
     typedef boost::shared_ptr<FrameSet> shared_ptr;
 
     FrameSet(const SequenceNumber& id);
-    void append(AMQFrame& part);
+    void append(const AMQFrame& part);
     bool isComplete() const;
 
     uint64_t getContentSize() const;
diff --git a/cpp/src/qpid/framing/ModelMethod.h b/cpp/src/qpid/framing/ModelMethod.h
index f3c0fa5d65..07600aadca 100644
--- a/cpp/src/qpid/framing/ModelMethod.h
+++ b/cpp/src/qpid/framing/ModelMethod.h
@@ -33,9 +33,9 @@ class ModelMethod : public AMQMethodBody
     mutable ExecutionHeader header;
 public:    
     virtual ~ModelMethod() {}
-    virtual void encode(Buffer& buffer) const { header.encode(buffer); }
-    virtual void decode(Buffer& buffer, uint32_t size=0) { header.decode(buffer, size); }
-    virtual uint32_t size() const { return header.size(); } 
+    virtual void encodeHeader(Buffer& buffer) const { header.encode(buffer); }
+    virtual void decodeHeader(Buffer& buffer, uint32_t size=0) { header.decode(buffer, size); }
+    virtual uint32_t headerSize() const { return header.size(); } 
     virtual bool isSync() const { return header.getSync(); }
     virtual void setSync(bool on) const { header.setSync(on); }
     ExecutionHeader& getHeader() { return header; }