From 9ed888b82b6cbbd5f312b81c7944b4eb3a2157a0 Mon Sep 17 00:00:00 2001 From: David Capello Date: Thu, 30 Sep 2010 16:31:59 -0300 Subject: [PATCH] Fix compilation errors with gcc in shared_ptr_unittest.cpp. --- src/base/shared_ptr_unittest.cpp | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/src/base/shared_ptr_unittest.cpp b/src/base/shared_ptr_unittest.cpp index 8aa65ee2d..98287c54e 100644 --- a/src/base/shared_ptr_unittest.cpp +++ b/src/base/shared_ptr_unittest.cpp @@ -37,17 +37,18 @@ TEST(SharedPtr, RefCount) EXPECT_EQ(1, b.getRefCount()); } + +class DeleteIsCalled +{ +public: + DeleteIsCalled(bool& flag) : m_flag(flag) { } + ~DeleteIsCalled() { m_flag = true; } +private: + bool& m_flag; +}; + TEST(SharedPtr, DeleteIsCalled) { - class DeleteIsCalled - { - public: - DeleteIsCalled(bool& flag) : m_flag(flag) { } - ~DeleteIsCalled() { m_flag = true; } - private: - bool& m_flag; - }; - bool flag = false; { SharedPtr a(new DeleteIsCalled(flag)); @@ -55,10 +56,12 @@ TEST(SharedPtr, DeleteIsCalled) EXPECT_EQ(true, flag); } + +class A { }; +class B : public A { }; + TEST(SharedPtr, Hierarchy) { - class A { }; - class B : public A { }; SharedPtr a(new B); SharedPtr b = a; SharedPtr c = a; @@ -66,6 +69,7 @@ TEST(SharedPtr, Hierarchy) EXPECT_EQ(4, a.getRefCount()); } + TEST(SharedPtr, Compare) { SharedPtr a(new int(0));