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/tests/RefCounted.cpp | 27 ++------------------------- 1 file changed, 2 insertions(+), 25 deletions(-) (limited to 'cpp/src/tests/RefCounted.cpp') diff --git a/cpp/src/tests/RefCounted.cpp b/cpp/src/tests/RefCounted.cpp index d111d58712..cd08a4491a 100644 --- a/cpp/src/tests/RefCounted.cpp +++ b/cpp/src/tests/RefCounted.cpp @@ -17,39 +17,16 @@ */ #include "qpid/RefCounted.h" +#include #include "unit_test.h" QPID_AUTO_TEST_SUITE(RefCountedTestSuiteTestSuite) +using boost::intrusive_ptr; using namespace std; using namespace qpid; -struct DummyCounted : public AbstractRefCounted { - DummyCounted() : count(0) {} - mutable int count; - virtual void addRef() const { count++; } - virtual void release() const { count--; } -}; - -BOOST_AUTO_TEST_CASE(testIntrusivePtr) { - DummyCounted dummy; - BOOST_CHECK_EQUAL(0, dummy.count); - { - intrusive_ptr p(&dummy); - BOOST_CHECK_EQUAL(1, dummy.count); - { - intrusive_ptr q(p); - BOOST_CHECK_EQUAL(2, dummy.count); - intrusive_ptr r; - r=q; - BOOST_CHECK_EQUAL(3, dummy.count); - } - BOOST_CHECK_EQUAL(1, dummy.count); - } - BOOST_CHECK_EQUAL(0, dummy.count); -} - struct CountMe : public RefCounted { static int instances; CountMe() { ++instances; } -- cgit v1.2.1