--- a/kerneltest/e32test/demandpaging/t_chunkheapcreate.cpp Thu Aug 19 11:14:22 2010 +0300
+++ b/kerneltest/e32test/demandpaging/t_chunkheapcreate.cpp Tue Aug 31 16:34:26 2010 +0300
@@ -64,10 +64,9 @@
UpdatePaged(aPaged);
RHeap* heap = UserHeap::ChunkHeap(aCreateInfo);
-
test_NotNull(heap);
RChunk chunk;
- chunk.SetHandle(heap->ChunkHandle());
+ chunk.SetHandle(((TestHybridHeap*) heap)->ChunkHandle());
TBool paged = chunk.IsPaged();
chunk.Close();
return (aPaged == paged);
@@ -215,8 +214,8 @@
{
test.Printf(_L("RHeap not created\n"));
}
- test.Printf(_L("chunkHandle = %d heapHandle = %d\n"),chunky.Handle(), heap->ChunkHandle());
- test_Equal(chunky.Handle(), heap->ChunkHandle());
+ test.Printf(_L("chunkHandle = %d heapHandle = %d\n"),chunky.Handle(), ((TestHybridHeap*) heap)->ChunkHandle());
+ test_Equal(chunky.Handle(), ((TestHybridHeap*) heap)->ChunkHandle());
heap->Close();
}
@@ -238,9 +237,9 @@
{
test.Printf(_L("RHeap not created\n"));
}
- test.Printf(_L("chunkHandle = %d heapHandle = %d\n"),chunky.Handle(), heap->ChunkHandle());
+ test.Printf(_L("chunkHandle = %d heapHandle = %d\n"),chunky.Handle(), ((TestHybridHeap*) heap)->ChunkHandle());
TBool isSame = EFalse;
- if (chunky.Handle() == heap->ChunkHandle())
+ if (chunky.Handle() == ((TestHybridHeap*) heap)->ChunkHandle())
isSame = ETrue;
test_Equal(EFalse, isSame);
heap->Close();
@@ -304,7 +303,7 @@
heap = (RHeap*)UserHeap::ChunkHeap(createInfo);
test_NotNull(heap);
RChunk chunk;
- chunk.SetHandle(heap->ChunkHandle());
+ chunk.SetHandle(((TestHybridHeap*) heap)->ChunkHandle());
TInt* numBuf = new TInt[gPageSize];
test_NotNull(numBuf);
test.Printf(_L("chunkSize = %d\n"), chunk.Size());
@@ -323,7 +322,7 @@
heap = (RHeap*)UserHeap::ChunkHeap(createInfo);
test_NotNull(heap);
RChunk chunk;
- chunk.SetHandle(heap->ChunkHandle());
+ chunk.SetHandle(((TestHybridHeap*) heap)->ChunkHandle());
TInt* numBuf = new TInt[gPageSize];
test_Equal(NULL, numBuf);
@@ -342,7 +341,7 @@
heap = (RHeap*)UserHeap::ChunkHeap(createInfo);
TInt heapAddr = (TInt)heap;
RChunk chunk;
- chunk.SetHandle(heap->ChunkHandle());
+ chunk.SetHandle(((TestHybridHeap*) heap)->ChunkHandle());
test_Equal((TInt)chunk.Base() + 8, heapAddr);
test_NotNull(heap);
heap->Close();