From 3f8a466daf6eba9717c27a635f2a7307cc4d03bd Mon Sep 17 00:00:00 2001 From: Andrew Stitcher Date: Mon, 24 Mar 2008 17:43:55 +0000 Subject: - Refactored RefCounted class to avoid virtual inheritance - Removed extraneous includes and definitions from RefCounted.h - Fixed all the places that were relying on RefCounted.h to be including the intrusive_ptr header file and were assuming that something had imported intrusive_ptr into the qpid namespace git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@640479 13f79535-47bb-0310-9956-ffa450edef68 --- cpp/src/qpid/framing/AMQFrame.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cpp/src/qpid/framing/AMQFrame.h') diff --git a/cpp/src/qpid/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h index 1c65988b3d..649a65bce4 100644 --- a/cpp/src/qpid/framing/AMQFrame.h +++ b/cpp/src/qpid/framing/AMQFrame.h @@ -28,6 +28,7 @@ #include "ProtocolVersion.h" #include "BodyHolder.h" +#include #include namespace qpid { @@ -38,7 +39,7 @@ class BodyHolder; class AMQFrame : public AMQDataBlock { public: - AMQFrame(intrusive_ptr b=0) : body(b) { init(); } + AMQFrame(boost::intrusive_ptr b=0) : body(b) { init(); } AMQFrame(const AMQBody& b) { setBody(b); init(); } ~AMQFrame(); @@ -50,7 +51,7 @@ class AMQFrame : public AMQDataBlock ChannelId getChannel() const { return channel; } void setChannel(ChannelId c) { channel = c; } - intrusive_ptr getHolder() { return body; } + boost::intrusive_ptr getHolder() { return body; } AMQBody* getBody() { return body ? body->get() : 0; } const AMQBody* getBody() const { return body ? body->get() : 0; } @@ -94,7 +95,7 @@ class AMQFrame : public AMQDataBlock private: void init() { bof = eof = bos = eos = true; subchannel=0; channel=0; } - intrusive_ptr body; + boost::intrusive_ptr body; uint16_t channel : 16; uint8_t subchannel : 8; bool bof : 1; -- cgit v1.2.1