rubygen/0-10/specification.rb:

 - Simplified enum mapping/encoding.
 - struct encoding
 - ostream << operators
  
src/qpid/Serializer.h
 - free funciton serialization
 - separate Encoder/Decoder for const correctness
 - split() to allow separate encode/decode for complex cases.

src/qpid/amqp_0_10/Assembly.cpp, Assembly.h: AMQP 0-10 final Assembly

src/qpid/amqp_0_10/Codec.h
 - Replaced enable_if with overloads, simpler & more flexible.

src/qpid/amqp_0_10/Frame.cpp, .h: AMQP 0-10 final frame.

src/qpid/amqp_0_10/Holder.h:
 - provide const and non-const apply 

src/qpid/amqp_0_10/Segment.cpp, .h: AMQP 0-10 final Segment.

src/qpid/amqp_0_10/apply.h
 - ConstApplyFunctor for const apply.

src/qpid/amqp_0_10/built_in_types.h
 - SerializableString encoding
 
src/qpid/amqp_0_10/complex_types.cpp, .h
 - const application
 - Action base class for command/control.
 
src/qpid/framing/AMQBody.h
 - removed 0-10 final changes, moving integration point down the stack.
 
src/qpid/sys/Shlib.h
 - removed unused and uncompilable (on some compilers) function.
 
src/qpid/sys/Time.h, .cpp
 - ostream << for AbsTime and Duration.
 
src/tests/Assembly.cpp, Segment.cpp, apply.cpp, serialize.cpp: testing new code.


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

1 files changed, 1 insertions, 11 deletions

diff --git a/cpp/src/qpid/framing/AMQBody.h b/cpp/src/qpid/framing/AMQBody.h
index 925f4c46ac..f3bf65470c 100644
--- a/cpp/src/qpid/framing/AMQBody.h
+++ b/cpp/src/qpid/framing/AMQBody.h
@@ -22,8 +22,6 @@
  *
  */
 #include "qpid/framing/amqp_types.h"
-#include "qpid/amqp_0_10/built_in_types.h"
-#include "qpid/amqp_0_10/complex_types.h"
 
 #include <ostream>
 
@@ -62,12 +60,6 @@ class AMQBody
     virtual AMQMethodBody* getMethod() { return 0; }
     virtual const AMQMethodBody* getMethod() const { return 0; }
 
-    virtual amqp_0_10::Command* getCommand() { return 0; }
-    virtual const amqp_0_10::Command* getCommand() const { return 0; }
-
-    virtual amqp_0_10::Control* getControl() { return 0; }
-    virtual const amqp_0_10::Control* getControl() const { return 0; }
-
     /** Match if same type and same class/method ID for methods */
     static bool match(const AMQBody& , const AMQBody& );
 };
@@ -78,9 +70,7 @@ enum BodyTypes {
     METHOD_BODY = 1,
     HEADER_BODY = 2,
     CONTENT_BODY = 3,
-    HEARTBEAT_BODY = 8,
-    COMMAND_BODY = 100+amqp_0_10::COMMAND,
-    CONTROL_BODY = 100+amqp_0_10::CONTROL
+    HEARTBEAT_BODY = 8
 };
 
 }} // namespace qpid::framing