kernel/eka/klib/kheap.cpp
branchRCL_3
changeset 44 3e88ff8f41d5
parent 43 c1f20ce4abcf
--- a/kernel/eka/klib/kheap.cpp	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/klib/kheap.cpp	Wed Sep 01 12:34:56 2010 +0100
@@ -20,7 +20,7 @@
 _LIT(KLitKernHeap,"KernHeap");
 
 RHeapK::RHeapK(TInt aInitialSize)
-	: RHybridHeap(aInitialSize, 0, EFalse)			
+	: RHeap(aInitialSize, 0, EFalse)
 	{
 	}
 
@@ -59,7 +59,8 @@
 // Create a kernel fixed heap.
 //
 	{
-	__ASSERT_ALWAYS(aInitialSize>(TInt)sizeof(RHeapK), K::Fault(K::ETHeapMaxLengthNegative));
+
+	__ASSERT_ALWAYS(aInitialSize>KMinHeapSize, K::Fault(K::ETHeapMaxLengthNegative));
 	return new(aBase) RHeapK(aInitialSize);
 	}
 
@@ -75,20 +76,6 @@
 	__ASSERT_CRITICAL;
 	}
 
-void RHybridHeap::Lock() const   
-	{
-	DMutex* m = *(DMutex**)&iLock;
-	if (m)
-		Kern::MutexWait(*m);
-	}
-
-void RHybridHeap::Unlock() const   
-	{
-	DMutex* m = *(DMutex**)&iLock;
-	if (m)
-		Kern::MutexSignal(*m);
-	}
-
 void RHeapK::Fault(TInt aFault)
 	{
 	Kern::Fault("KERN-HEAP", aFault);