4 files changed, 9 insertions, 9 deletions
diff --git a/cpp/src/tests/FieldTable.cpp b/cpp/src/tests/FieldTable.cpp
index 953b853cd6..9c75970278 100644
--- a/cpp/src/tests/FieldTable.cpp
+++ b/cpp/src/tests/FieldTable.cpp
@@ -69,11 +69,11 @@ QPID_AUTO_TEST_CASE(testAssignment)
         FieldTable c;
         c = a;
         
-        char* buff = static_cast<char*>(::alloca(c.size()));
-        Buffer wbuffer(buff, c.size());
+        char* buff = static_cast<char*>(::alloca(c.encodedSize()));
+        Buffer wbuffer(buff, c.encodedSize());
         wbuffer.put(c);
 
-        Buffer rbuffer(buff, c.size());
+        Buffer rbuffer(buff, c.encodedSize());
         rbuffer.get(d);
         BOOST_CHECK_EQUAL(c, d);
         BOOST_CHECK(string("CCCC") == c.getString("A"));
diff --git a/cpp/src/tests/Frame.cpp b/cpp/src/tests/Frame.cpp
index 9ee3848b7b..11905911fa 100644
--- a/cpp/src/tests/Frame.cpp
+++ b/cpp/src/tests/Frame.cpp
@@ -33,7 +33,7 @@ QPID_AUTO_TEST_CASE(testContentBody) {
     Frame f(42, AMQContentBody("foobar"));
     AMQBody* body=f.getBody();
     BOOST_CHECK(dynamic_cast<AMQContentBody*>(body));
-    Buffer b(f.size());
+    Buffer b(f.encodedSize();
     f.encode(b);
     b.flip();
     Frame g;
@@ -50,7 +50,7 @@ QPID_AUTO_TEST_CASE(testMethodBody) {
         42, QueueDeclareBody(ProtocolVersion(), 1, "q", "altex",
                              true, false, true, false, true, args));
     BOOST_CHECK_EQUAL(f.getChannel(), 42);
-    Buffer b(f.size());
+    Buffer b(f.encodedSize();
     f.encode(b);
     b.flip();
     Frame g;
diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp
index c3b64419ed..33bf705e65 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/cpp/src/tests/HeaderTest.cpp
@@ -39,7 +39,7 @@ QPID_AUTO_TEST_CASE(testGenericProperties)
 
     Buffer rbuffer(buff, 100);
     AMQHeaderBody body2;
-    body2.decode(rbuffer, body.size());
+    body2.decode(rbuffer, body.encodedSize());
     MessageProperties* props =
         body2.get<MessageProperties>(true);
     BOOST_CHECK_EQUAL(
diff --git a/cpp/src/tests/SessionState.cpp b/cpp/src/tests/SessionState.cpp
index ba966da9b1..2db25f9fe8 100644
--- a/cpp/src/tests/SessionState.cpp
+++ b/cpp/src/tests/SessionState.cpp
@@ -85,7 +85,7 @@ AMQFrame contentFrameChar(char content, bool isLast=true) {
 }
 
 // Send frame & return size of frame.
-size_t send(qpid::SessionState& s, const AMQFrame& f) { s.senderRecord(f); return f.size(); }
+size_t send(qpid::SessionState& s, const AMQFrame& f) { s.senderRecord(f); return f.encodedSize(); }
 // Send transfer command with no content.
 size_t transfer0(qpid::SessionState& s) { return send(s, transferFrame(false)); }
 // Send transfer frame with single content frame.
@@ -116,8 +116,8 @@ size_t transfers(qpid::SessionState& s, string content) {
                            bind(transfer1Char, ref(s), _1));
 }
 
-size_t contentFrameSize(size_t n=1) { return AMQFrame(in_place<AMQContentBody>()).size() + n; }
-size_t transferFrameSize() { return AMQFrame(in_place<MessageTransferBody>()).size(); }
+size_t contentFrameSize(size_t n=1) { return AMQFrame(in_place<AMQContentBody>()).encodedSize() + n; }
+size_t transferFrameSize() { return AMQFrame(in_place<MessageTransferBody>()).encodedSize(); }
 
 // ==== qpid::SessionState test classes