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, 67 deletions

diff --git a/cpp/src/qpid/ExceptionHolder.h b/cpp/src/qpid/ExceptionHolder.h
deleted file mode 100644
index 723dac4b2d..0000000000
--- a/cpp/src/qpid/ExceptionHolder.h
+++ /dev/null
@@ -1,67 +0,0 @@
-#ifndef _qpid_ExceptionHolder_h
-#define _qpid_ExceptionHolder_h
-
-/*
- *
- * Copyright (c) 2006 The Apache Software Foundation
- *
- * Licensed 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 <assert.h>
-#include "Exception.h"
-#include <boost/shared_ptr.hpp>
-
-namespace qpid {
-
-// FIXME aconway 2007-02-20:  Not necessary, a simple
-// Exception::shared_ptr will do the job. Remove
-// 
-/**
- * Holder for a heap-allocated exc eption that can be stack allocated
- * and thrown safely.
- *
- * Basically this is a shared_ptr with the Exception functions added
- * so the catcher need not be aware that it is a pointer rather than a
- * reference.
- * 
- * shared_ptr is chosen over auto_ptr because it has normal 
- * copy semantics. 
- */
-class ExceptionHolder : public Exception, public boost::shared_ptr<Exception>
-{
-  public:
-    typedef boost::shared_ptr<Exception> shared_ptr;
-
-    ExceptionHolder() throw() {}
-    ExceptionHolder(Exception* p) throw() : shared_ptr(p) {}
-    ExceptionHolder(shared_ptr p) throw() : shared_ptr(p) {}
-
-    ExceptionHolder(const Exception& e) throw() : shared_ptr(e.clone()) {}
-    ExceptionHolder(const std::exception& e);
-
-    ~ExceptionHolder() throw() {}
-
-    const char* what() const throw() { return get()->what(); }
-    std::string toString() const throw() { return get()->toString(); }
-    Exception* clone() const throw() { return get()->clone(); }
-    void throwIf() const { if (get()) get()->throwSelf(); }
-    void throwSelf() const { assert(get()); get()->throwSelf(); }
-};
-
-} // namespace qpid
-
-
-
-#endif  /*!_qpid_ExceptionHolder_h*/