16772N/A--- ptlib-2.6.4/src/ptlib/common/contain.cxx.orig 2009-07-13 09:40:42.071317000 +0800

16772N/A+++ ptlib-2.6.4/src/ptlib/common/contain.cxx 2009-07-13 14:10:16.248768000 +0800

16772N/A@@ -67,7 +67,7 @@

16772N/A {

16772N/A public:

16772N/A Type * Allocate(size_t n)

16772N/A- { return a.allocate(n); }

16772N/A+ { return (Type *)a.allocate(n); }

16772N/A

16772N/A void Deallocate(Type * p, size_t n)

16772N/A { a.deallocate(p, n); }

16772N/A@@ -110,7 +110,7 @@

16772N/A

16772N/A PContainer::PContainer(PINDEX initialSize)

16772N/A {

16772N/A- reference = PContainerReference_new(initialSize);

16772N/A+ reference = new PContainerReference(initialSize);

16772N/A PAssert(reference != NULL, POutOfMemory);

16772N/A }

16772N/A

16772N/A@@ -122,7 +122,7 @@

16772N/A PAssert(cont != NULL, PInvalidParameter);

16772N/A PAssert2(cont->reference != NULL, cont->GetClass(), "Clone of deleted container");

16772N/A

16772N/A- reference = PContainerReference_new(*cont->reference);

16772N/A+ reference = new PContainerReference(*cont->reference);

16772N/A PAssert(reference != NULL, POutOfMemory);

16772N/A }

16772N/A

16772N/A@@ -196,7 +196,7 @@

16772N/A return PTrue;

16772N/A

16772N/A PContainerReference * oldReference = reference;

16772N/A- reference = PContainerReference_new(*reference);

16772N/A+ reference = new PContainerReference(*reference);

16772N/A --oldReference->count;

16772N/A

16772N/A return PFalse;

16772N/A@@ -387,7 +387,7 @@

16772N/A }

16772N/A

16772N/A --reference->count;

16772N/A- reference = PContainerReference_new(newSize);

16772N/A+ reference = new PContainerReference(newSize);

16772N/A

16772N/A } else {

16772N/A