replace implementation with a auto-create and propagating-const wrapper for smart pointers which auto delete the holded pointer on destruction
git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@522 7ec92016-0320-0410-acc4-a06ded1c099a
This commit is contained in:
syntheticpp
parent
698214fb58
commit
147eca6930
6 changed files with 294 additions and 654 deletions
|
|
@ -24,19 +24,19 @@
|
|||
#include "type2.h"
|
||||
|
||||
#include <loki/SafeFormat.h>
|
||||
#include <loki/PimplDef.h>
|
||||
|
||||
|
||||
|
||||
/////////////////////////////////////////
|
||||
// Definition of Impl<A>
|
||||
// Definition of ImplT<A>
|
||||
/////////////////////////////////////////
|
||||
namespace Loki // gcc!!
|
||||
{
|
||||
template<>
|
||||
struct Impl<A> : public SmallObject<> // inherit SmallObj for speed up
|
||||
struct ImplT<A> : public SmallObject<> // inherit SmallObj for speed up
|
||||
{
|
||||
Impl() : data(0) {Printf("A created\n");}
|
||||
~Impl(){Printf("A destroyed, data=%d\n")(data);}
|
||||
ImplT() : data(0) {Printf("A created\n");}
|
||||
~ImplT(){Printf("A destroyed, data=%d\n")(data);}
|
||||
int data;
|
||||
};
|
||||
}
|
||||
|
|
@ -54,22 +54,22 @@ void A::foo()
|
|||
|
||||
|
||||
/////////////////////////////////////////
|
||||
// Definition of Impl<B>
|
||||
// Definition of ImplT<B>
|
||||
/////////////////////////////////////////
|
||||
namespace Loki // gcc!!
|
||||
{
|
||||
template<>
|
||||
struct Impl<B> : public SmallObject<> // inherit SmallObj for speed up
|
||||
struct ImplT<B> : public SmallObject<> // inherit SmallObj for speed up
|
||||
{
|
||||
Impl() : data(0) {Printf("B created\n");}
|
||||
~Impl(){Printf("B destroyed, data=%d\n")(data);}
|
||||
ImplT() : data(0) {Printf("B created\n");}
|
||||
~ImplT(){Printf("B destroyed, data=%d\n")(data);}
|
||||
int data;
|
||||
};
|
||||
}
|
||||
/////////////////////////////////////////
|
||||
// class B definition
|
||||
/////////////////////////////////////////
|
||||
B::B() : Loki::Pimpl<B>::Owner()
|
||||
B::B() : Loki::PimplT<B>::Owner()
|
||||
{}
|
||||
|
||||
void B::foo()
|
||||
|
|
@ -80,22 +80,22 @@ void B::foo()
|
|||
|
||||
|
||||
/////////////////////////////////////////
|
||||
// Definition of Impl<C>
|
||||
// Definition of ImplT<C>
|
||||
/////////////////////////////////////////
|
||||
namespace Loki // gcc!!
|
||||
{
|
||||
template<>
|
||||
struct Impl<C> : public SmallObject<> // inherit SmallObj for speed up
|
||||
struct ImplT<C> : public SmallObject<> // inherit SmallObj for speed up
|
||||
{
|
||||
Impl(): data(0) {Printf("C created\n");}
|
||||
~Impl(){Printf("C destroyed, data=%d\n")(data);}
|
||||
ImplT(): data(0) {Printf("C created\n");}
|
||||
~ImplT(){Printf("C destroyed, data=%d\n")(data);}
|
||||
int data;
|
||||
};
|
||||
}
|
||||
/////////////////////////////////////////
|
||||
// class C definition
|
||||
/////////////////////////////////////////
|
||||
C::C() : d(rinit)
|
||||
C::C() : p(), d(*p)
|
||||
{}
|
||||
|
||||
void C::foo()
|
||||
|
|
@ -106,22 +106,23 @@ void C::foo()
|
|||
|
||||
|
||||
/////////////////////////////////////////
|
||||
// Definition of Impl<D>
|
||||
// Definition of ImplT<D>
|
||||
/////////////////////////////////////////
|
||||
namespace Loki // gcc!!
|
||||
{
|
||||
template<>
|
||||
struct Impl<D> : public SmallObject<> // inherit SmallObj for speed up
|
||||
struct ImplT<D> : public SmallObject<> // inherit SmallObj for speed up
|
||||
{
|
||||
Impl(): data(0) {Printf("D created\n");}
|
||||
~Impl(){Printf("D destroyed, data=%d\n")(data);}
|
||||
ImplT(): data(0) {Printf("D created\n");}
|
||||
~ImplT(){Printf("D destroyed, data=%d\n")(data);}
|
||||
int data;
|
||||
};
|
||||
}
|
||||
|
||||
/////////////////////////////////////////
|
||||
// class D definition
|
||||
/////////////////////////////////////////
|
||||
D::D() : Loki::Rimpl<D>::Owner()
|
||||
D::D() : Loki::RimplT<D>::Owner()
|
||||
{}
|
||||
|
||||
void D::foo()
|
||||
|
|
@ -133,45 +134,11 @@ void D::foo()
|
|||
/////////////////////////////////////////
|
||||
// main
|
||||
/////////////////////////////////////////
|
||||
|
||||
void test_more();
|
||||
|
||||
//#define MSVC_DETECT_MEMORY_LEAKS
|
||||
#ifdef MSVC_DETECT_MEMORY_LEAKS
|
||||
|
||||
#include <crtdbg.h>
|
||||
#include <cassert>
|
||||
|
||||
void heap_debug()
|
||||
{
|
||||
int tmpFlag = _CrtSetDbgFlag( _CRTDBG_REPORT_FLAG );
|
||||
|
||||
// Turn on leak-checking bit
|
||||
tmpFlag |= _CRTDBG_LEAK_CHECK_DF;
|
||||
|
||||
//tmpFlag |= _CRTDBG_CHECK_ALWAYS_DF;
|
||||
|
||||
// Turn off CRT block checking bit
|
||||
tmpFlag &= ~_CRTDBG_CHECK_CRT_DF;
|
||||
|
||||
// Set flag to the new value
|
||||
_CrtSetDbgFlag( tmpFlag );
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
void heap_debug()
|
||||
{
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
int main()
|
||||
{
|
||||
heap_debug();
|
||||
|
||||
A* a = new A;
|
||||
B* b = new B;
|
||||
C* c = new C;
|
||||
|
|
@ -200,15 +167,15 @@ int main()
|
|||
////////////////////
|
||||
|
||||
/////////////////////////////////////////
|
||||
// Definition of Impl<E>
|
||||
// Definition of ImplT<E>
|
||||
/////////////////////////////////////////
|
||||
namespace Loki // gcc!!
|
||||
{
|
||||
template<>
|
||||
struct Impl<E> : public SmallObject<> // inherit SmallObj for speed up
|
||||
struct ImplT<E> : public SmallObject<> // inherit SmallObj for speed up
|
||||
{
|
||||
Impl() : data(0) {Printf("E created\n");}
|
||||
~Impl(){Printf("E destroyed, data=%d\n")(data);}
|
||||
ImplT() : data(0) {Printf("E created\n");}
|
||||
~ImplT(){Printf("E destroyed, data=%d\n")(data);}
|
||||
int data;
|
||||
|
||||
void foo() {Printf("E foo() \n");}
|
||||
|
|
@ -223,43 +190,77 @@ P2::P2(){d->data = 2;}
|
|||
P3::P3(){d->data = 3;}
|
||||
P4::P4(){d->data = 4;}
|
||||
P5::P5(){d->data = 5;}
|
||||
P6::P6(){d->data = 6;}
|
||||
|
||||
PO1::PO1(){d->data = 6;}
|
||||
PO2::PO2(){d->data = 7;}
|
||||
PO3::PO3(){d->data = 8;}
|
||||
PO4::PO4(){d->data = 9;}
|
||||
PO5::PO5(){d->data = 10;}
|
||||
|
||||
void P1::f(){d->foo();}
|
||||
void P2::f(){d->foo();}
|
||||
void P3::f(){d->foo();}
|
||||
void P4::f(){d->foo();}
|
||||
void P5::f(){d->foo();}
|
||||
void P6::f(){d->foo();}
|
||||
|
||||
void PO1::f(){d->foo();}
|
||||
void PO2::f(){d->foo();}
|
||||
void PO3::f(){d->foo();}
|
||||
void PO4::f(){d->foo();}
|
||||
void PO5::f(){d->foo();}
|
||||
|
||||
void P1::f()const{d->foo();}
|
||||
void P2::f()const{d->foo();}
|
||||
void P3::f()const{d->foo();}
|
||||
void P4::f()const{d->foo();}
|
||||
void P5::f()const{d->foo();}
|
||||
void P6::f()const{d->foo();}
|
||||
|
||||
void PO1::f()const{d->foo();}
|
||||
void PO2::f()const{d->foo();}
|
||||
void PO3::f()const{d->foo();}
|
||||
void PO4::f()const{d->foo();}
|
||||
void PO5::f()const{d->foo();}
|
||||
|
||||
|
||||
R1::R1(){d.data = 11;}
|
||||
R2::R2(){d.data = 22;}
|
||||
R3::R3(){d.data = 33;}
|
||||
R4::R4():d(rinit){d.data = 44;}
|
||||
R5::R5():d(rinit){d.data = 55;}
|
||||
R6::R6():d(rinit){d.data = 66;}
|
||||
|
||||
|
||||
R1::R1():d(*p){d.data = 11;}
|
||||
R2::R2():d(*p){d.data = 22;}
|
||||
R3::R3():d(*p){d.data = 33;}
|
||||
R4::R4():d(*p){d.data = 44;}
|
||||
R5::R5():d(*p){d.data = 55;}
|
||||
|
||||
void R1::f(){d.foo();}
|
||||
void R2::f(){d.foo();}
|
||||
void R3::f(){d.foo();}
|
||||
void R4::f(){d.foo();}
|
||||
void R5::f(){d.foo();}
|
||||
void R6::f(){d.foo();}
|
||||
|
||||
void R1::f()const{d.foo();}
|
||||
void R2::f()const{d.foo();}
|
||||
void R3::f()const{d.foo();}
|
||||
void R4::f()const{d.foo();}
|
||||
void R5::f()const{d.foo();}
|
||||
void R6::f()const{d.foo();}
|
||||
|
||||
|
||||
|
||||
RO1::RO1(){d.data = 66;}
|
||||
RO2::RO2(){d.data = 77;}
|
||||
RO3::RO3(){d.data = 88;}
|
||||
RO4::RO4(){d.data = 99;}
|
||||
RO5::RO5(){d.data = 1010;}
|
||||
|
||||
void RO1::f(){d.foo();}
|
||||
void RO2::f(){d.foo();}
|
||||
void RO3::f(){d.foo();}
|
||||
void RO4::f(){d.foo();}
|
||||
void RO5::f(){d.foo();}
|
||||
|
||||
void RO1::f()const{d.foo();}
|
||||
void RO2::f()const{d.foo();}
|
||||
void RO3::f()const{d.foo();}
|
||||
void RO4::f()const{d.foo();}
|
||||
void RO5::f()const{d.foo();}
|
||||
|
||||
|
||||
void test_more()
|
||||
|
|
@ -267,12 +268,16 @@ void test_more()
|
|||
Loki::Printf("\n\nMore tests:\n");
|
||||
|
||||
Loki::Printf("\nCreating Pimpls\n");
|
||||
P1* p1 = new P1;
|
||||
P1* p1 = new P1;
|
||||
P2* p2 = new P2;
|
||||
P3* p3 = new P3;
|
||||
P4* p4 = new P4;
|
||||
P5* p5 = new P5;
|
||||
P6* p6 = new P6;
|
||||
PO1* p6 = new PO1;
|
||||
PO2* p7 = new PO2;
|
||||
PO3* p8 = new PO3;
|
||||
PO4* p9 = new PO4;
|
||||
PO5* p10 = new PO5;
|
||||
|
||||
Loki::Printf("\nConst check\n");
|
||||
p1->f();
|
||||
|
|
@ -280,7 +285,11 @@ void test_more()
|
|||
p3->f();
|
||||
p4->f();
|
||||
p5->f();
|
||||
p6->f();
|
||||
p6->f();
|
||||
p7->f();
|
||||
p8->f();
|
||||
p9->f();
|
||||
p10->f();
|
||||
|
||||
Loki::Printf("\nDeleting Pimpls\n");
|
||||
delete p1;
|
||||
|
|
@ -289,22 +298,35 @@ void test_more()
|
|||
delete p4;
|
||||
delete p5;
|
||||
delete p6;
|
||||
delete p7;
|
||||
delete p8;
|
||||
delete p9;
|
||||
delete p10;
|
||||
|
||||
|
||||
Loki::Printf("\nCreating Rimpls\n");
|
||||
R1* r1 = new R1;
|
||||
R2* r2 = new R2;
|
||||
R3* r3 = new R3;
|
||||
R4* r4 = new R4;
|
||||
R5* r5 = new R5;
|
||||
R6* r6 = new R6;
|
||||
|
||||
Loki::Printf("\nConst check\n");
|
||||
r1->f();
|
||||
RO1* r6 = new RO1;
|
||||
RO2* r7 = new RO2;
|
||||
RO3* r8 = new RO3;
|
||||
RO4* r9 = new RO4;
|
||||
RO5* r10 = new RO5;
|
||||
|
||||
r1->f();
|
||||
r2->f();
|
||||
r3->f();
|
||||
r4->f();
|
||||
r5->f();
|
||||
r6->f();
|
||||
r7->f();
|
||||
r8->f();
|
||||
r9->f();
|
||||
r10->f();
|
||||
|
||||
Loki::Printf("\nDeleting Rimpls\n");
|
||||
delete r1;
|
||||
|
|
@ -313,14 +335,24 @@ void test_more()
|
|||
delete r4;
|
||||
delete r5;
|
||||
delete r6;
|
||||
delete r7;
|
||||
delete r8;
|
||||
delete r9;
|
||||
delete r10;
|
||||
|
||||
Loki::Printf("\nCreating Pimpls\n");
|
||||
|
||||
Loki::Printf("\nCreating const Pimpls\n");
|
||||
const P1* cp1 = new P1;
|
||||
const P2* cp2 = new P2;
|
||||
const P3* cp3 = new P3;
|
||||
const P4* cp4 = new P4;
|
||||
const P5* cp5 = new P5;
|
||||
const P6* cp6 = new P6;
|
||||
|
||||
const PO1* cp6 = new PO1;
|
||||
const PO2* cp7 = new PO2;
|
||||
const PO3* cp8 = new PO3;
|
||||
const PO4* cp9 = new PO4;
|
||||
const PO5* cp10 = new PO5;
|
||||
|
||||
Loki::Printf("\nConst check\n");
|
||||
cp1->f();
|
||||
|
|
@ -329,38 +361,20 @@ void test_more()
|
|||
cp4->f();
|
||||
cp5->f();
|
||||
cp6->f();
|
||||
cp7->f();
|
||||
cp8->f();
|
||||
cp9->f();
|
||||
cp10->f();
|
||||
|
||||
Loki::Printf("\nDeleting Rimpls\n");
|
||||
Loki::Printf("\nDeleting const Pimpls\n");
|
||||
delete cp1;
|
||||
delete cp2;
|
||||
delete cp3;
|
||||
delete cp4;
|
||||
delete cp5;
|
||||
delete cp6;
|
||||
|
||||
|
||||
Loki::Printf("\nCreating Rimpls\n");
|
||||
const R1* cr1 = new R1;
|
||||
const R2* cr2 = new R2;
|
||||
const R3* cr3 = new R3;
|
||||
const R4* cr4 = new R4;
|
||||
const R5* cr5 = new R5;
|
||||
const R6* cr6 = new R6;
|
||||
|
||||
Loki::Printf("\nConst check\n");
|
||||
cr1->f();
|
||||
cr2->f();
|
||||
cr3->f();
|
||||
cr4->f();
|
||||
cr5->f();
|
||||
cr6->f();
|
||||
|
||||
Loki::Printf("\nDeleting Rimpls\n");
|
||||
delete cr1;
|
||||
delete cr2;
|
||||
delete cr3;
|
||||
delete cr4;
|
||||
delete cr5;
|
||||
delete cr6;
|
||||
|
||||
delete cp6;
|
||||
delete cp7;
|
||||
delete cp8;
|
||||
delete cp9;
|
||||
delete cp10;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue