Removed BodyHolder: minor performance improvement, opens the way for more efficient memory management.

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

1 files changed, 3 insertions, 16 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index f97abf24f2..56c7cf39e1 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -27,7 +27,6 @@ windows_dist = \
   broker.vcproj \
   common.vcproj \
   client.vcproj \
-  MaxMethodBodySize.vcproj \
   qmfconsole.vcproj \
   protocol_gen.mak \
   qpid/log/windows/SinkOptions.cpp \
@@ -99,14 +98,6 @@ endif # GENERATE
 include $(srcdir)/rubygen.mk
 include $(srcdir)/managementgen.mk
 
-# Code generated by C++
-noinst_PROGRAMS=generate_MaxMethodBodySize_h
-generate_MaxMethodBodySize_h_SOURCES=gen/generate_MaxMethodBodySize_h.cpp
-qpid/framing/MaxMethodBodySize.h: generate_MaxMethodBodySize_h
-	./generate_MaxMethodBodySize_h
-BUILT_SOURCES=qpid/framing/MaxMethodBodySize.h
-DISTCLEANFILES=qpid/framing/MaxMethodBodySize.h
-
 ## Compiler flags
 AM_CXXFLAGS = $(WARNING_CFLAGS)
 AM_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
@@ -231,7 +222,7 @@ cmodule_LTLIBRARIES += \
   rdmaconnector.la
 
 # RDMA test/sample programs
-noinst_PROGRAMS += RdmaServer RdmaClient
+noinst_PROGRAMS = RdmaServer RdmaClient
 RdmaServer_SOURCES = qpid/sys/rdma/RdmaServer.cpp
 RdmaServer_LDADD = \
   librdmawrap.la libqpidcommon.la
@@ -318,7 +309,6 @@ libqpidcommon_la_SOURCES = \
   qpid/framing/AMQHeaderBody.cpp \
   qpid/framing/AMQHeartbeatBody.cpp \
   qpid/framing/Array.cpp \
-  qpid/framing/BodyHolder.cpp \
   qpid/framing/BodyHandler.cpp \
   qpid/framing/Buffer.cpp \
   qpid/framing/Endian.cpp \
@@ -335,8 +325,6 @@ libqpidcommon_la_SOURCES = \
   qpid/framing/Proxy.cpp \
   qpid/framing/Uuid.cpp \
   qpid/framing/AMQP_HighestVersion.h \
-  qpid/framing/Blob.cpp \
-  qpid/framing/MaxMethodBodySize.h \
   qpid/framing/TransferContent.cpp \
   qpid/log/Logger.cpp \
   qpid/log/Options.cpp \
@@ -624,9 +612,9 @@ nobase_include_HEADERS = \
   qpid/framing/AMQP_HighestVersion.h \
   qpid/framing/AccumulatedAck.h \
   qpid/framing/Array.h \
-  qpid/framing/Blob.h \
   qpid/framing/BodyHandler.h \
-  qpid/framing/BodyHolder.h \
+  qpid/framing/BodyFactory.h \
+  qpid/framing/MethodBodyFactory.h \
   qpid/framing/Buffer.h \
   qpid/framing/ChannelHandler.h \
   qpid/framing/Endian.h \
@@ -642,7 +630,6 @@ nobase_include_HEADERS = \
   qpid/framing/InputHandler.h \
   qpid/framing/InitiationHandler.h \
   qpid/framing/MethodContent.h \
-  qpid/framing/MaxMethodBodySize.h \
   qpid/framing/ModelMethod.h \
   qpid/framing/OutputHandler.h \
   qpid/framing/ProtocolInitiation.h \