Added framing::BodyHolder:

 - Uniform holder for all body types, replaces MethodHolder.
 - Uses in_place constructors to avoid avoid body copy.

framing::AMQFrame:
 - Holds body in heap-allocated intrusive_ptr<BodyHolder>
 - Uses in_place constructors to avoid avoid body copy.

Removed/downgraded to TODO many redundant FIXME comments.


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

1 files changed, 0 insertions, 65 deletions

diff --git a/cpp/src/qpid/framing/MethodHolder.cpp b/cpp/src/qpid/framing/MethodHolder.cpp
deleted file mode 100644
index 78dd2bdcaf..0000000000
--- a/cpp/src/qpid/framing/MethodHolder.cpp
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-
-#include "MethodHolder.h"
-#include "qpid/framing/AMQMethodBody.h"
-#include "qpid/framing/Buffer.h"
-
-// Note: MethodHolder::construct is and operator= are code-generated
-// in file MethodHolder_construct.cpp.
-
-using namespace boost;
-
-namespace qpid {
-namespace framing {
-
-AMQMethodBody* MethodHolder::get() {
-    return blob.get();
-}
-
-const AMQMethodBody* MethodHolder::get() const {
-    return blob.get();
-}
-
-void MethodHolder::encode(Buffer& b) const {
-    const AMQMethodBody* body = get();
-    b.putOctet(body->amqpClassId());
-    b.putOctet(body->amqpMethodId());
-    body->encode(b);
-}
-
-void MethodHolder::decode(Buffer& b) {
-    ClassId c=b.getOctet();
-    MethodId m=b.getOctet();
-    construct(c,m);
-    get()->decode(b);
-}
-
-uint32_t  MethodHolder::size() const {
-    return sizeof(ClassId)+sizeof(MethodId)+get()->size();
-}
-
-std::ostream& operator<<(std::ostream& out, const MethodHolder& h) {
-    h.get()->print(out);
-    return out;
-}
-
-}} // namespace qpid::framing