mirror of
https://github.com/taglib/taglib.git
synced 2025-07-22 23:14:33 -04:00
Removed smart pointers from public headers
This commit is contained in:
@ -26,7 +26,7 @@ public:
|
||||
void testSharedptrBasic()
|
||||
{
|
||||
int * ip = new int;
|
||||
RefCountPtr<int> cp ( ip );
|
||||
SHARED_PTR<int> cp ( ip );
|
||||
CPPUNIT_ASSERT( ip == cp.get() );
|
||||
CPPUNIT_ASSERT( cp.use_count() == 1 );
|
||||
|
||||
@ -36,7 +36,7 @@ public:
|
||||
ck( static_cast<int*>(cp.get()), 54321 );
|
||||
ck( static_cast<int*>(ip), *cp );
|
||||
|
||||
RefCountPtr<int> cp2 ( cp );
|
||||
SHARED_PTR<int> cp2 ( cp );
|
||||
CPPUNIT_ASSERT( ip == cp2.get() );
|
||||
CPPUNIT_ASSERT( cp.use_count() == 2 );
|
||||
CPPUNIT_ASSERT( cp2.use_count() == 2 );
|
||||
@ -46,7 +46,7 @@ public:
|
||||
ck( static_cast<int*>(cp2.get()), 54321 );
|
||||
ck( static_cast<int*>(ip), *cp2 );
|
||||
|
||||
RefCountPtr<int> cp3 ( cp );
|
||||
SHARED_PTR<int> cp3 ( cp );
|
||||
CPPUNIT_ASSERT( cp.use_count() == 3 );
|
||||
CPPUNIT_ASSERT( cp2.use_count() == 3 );
|
||||
CPPUNIT_ASSERT( cp3.use_count() == 3 );
|
||||
@ -76,16 +76,16 @@ public:
|
||||
CPPUNIT_ASSERT( cp.use_count() == 3 );
|
||||
CPPUNIT_ASSERT( *cp == 87654 );
|
||||
|
||||
RefCountPtr<int> cp4;
|
||||
SHARED_PTR<int> cp4;
|
||||
swap( cp2, cp4 );
|
||||
CPPUNIT_ASSERT( cp4.use_count() == 3 );
|
||||
CPPUNIT_ASSERT( *cp4 == 87654 );
|
||||
CPPUNIT_ASSERT( cp2.get() == 0 );
|
||||
|
||||
std::set< RefCountPtr<int> > scp;
|
||||
std::set< SHARED_PTR<int> > scp;
|
||||
scp.insert(cp4);
|
||||
CPPUNIT_ASSERT( scp.find(cp4) != scp.end() );
|
||||
CPPUNIT_ASSERT( scp.find(cp4) == scp.find( RefCountPtr<int>(cp4) ) );
|
||||
CPPUNIT_ASSERT( scp.find(cp4) == scp.find( SHARED_PTR<int>(cp4) ) );
|
||||
}
|
||||
|
||||
private:
|
||||
@ -130,7 +130,7 @@ public:
|
||||
derivedDestructorCalled = false;
|
||||
|
||||
{
|
||||
RefCountPtr<DummyBase> p1(new DummyDerived(100));
|
||||
SHARED_PTR<DummyBase> p1(new DummyDerived(100));
|
||||
CPPUNIT_ASSERT(p1->getValue() == 100);
|
||||
}
|
||||
|
||||
@ -141,8 +141,8 @@ public:
|
||||
derivedDestructorCalled = false;
|
||||
|
||||
{
|
||||
RefCountPtr<DummyDerived> p1(new DummyDerived(100));
|
||||
RefCountPtr<DummyBase> p2 = p1;
|
||||
SHARED_PTR<DummyDerived> p1(new DummyDerived(100));
|
||||
SHARED_PTR<DummyBase> p2 = p1;
|
||||
|
||||
CPPUNIT_ASSERT(p1->getValue() == 100);
|
||||
CPPUNIT_ASSERT(p2->getValue() == 100);
|
||||
@ -155,8 +155,8 @@ public:
|
||||
derivedDestructorCalled = false;
|
||||
|
||||
{
|
||||
RefCountPtr<DummyDerived> p1;
|
||||
RefCountPtr<DummyBase> p2;
|
||||
SHARED_PTR<DummyDerived> p1;
|
||||
SHARED_PTR<DummyBase> p2;
|
||||
|
||||
p1.reset(new DummyDerived(100));
|
||||
p2 = p1;
|
||||
@ -171,7 +171,7 @@ public:
|
||||
|
||||
private:
|
||||
class DummyIncomplete;
|
||||
RefCountPtr<DummyIncomplete> pincomplete;
|
||||
SHARED_PTR<DummyIncomplete> pincomplete;
|
||||
|
||||
class DummyIncomplete
|
||||
{
|
||||
|
Reference in New Issue
Block a user