synchronized with trunk except for ruby dir

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid.rnr@893970 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/qpid/framing/AMQHeaderBody.cpp b/cpp/src/qpid/framing/AMQHeaderBody.cpp
index 724c288705..14218f1b45 100644
--- a/cpp/src/qpid/framing/AMQHeaderBody.cpp
+++ b/cpp/src/qpid/framing/AMQHeaderBody.cpp
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include "AMQHeaderBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
 #include "qpid/Exception.h"
 #include "qpid/log/Statement.h"
 
-uint32_t qpid::framing::AMQHeaderBody::size() const {
-    return properties.size();
+uint32_t qpid::framing::AMQHeaderBody::encodedSize() const {
+    return properties.encodedSize();
 }
 
 void qpid::framing::AMQHeaderBody::encode(Buffer& buffer) const {
@@ -52,7 +52,7 @@ uint64_t qpid::framing::AMQHeaderBody::getContentLength() const
 
 void qpid::framing::AMQHeaderBody::print(std::ostream& out) const
 {
-    out << "header (" << size() << " bytes)";
+    out << "header (" << encodedSize() << " bytes)";
     out << "; properties={";
     properties.print(out);
     out << "}";