diff -r c1f20ce4abcf -r 3e88ff8f41d5 userlibandfileserver/fileserver/sfile/sf_memory_man.cpp --- a/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Tue Aug 31 16:34:26 2010 +0300 +++ b/userlibandfileserver/fileserver/sfile/sf_memory_man.cpp Wed Sep 01 12:34:56 2010 +0100 @@ -81,7 +81,7 @@ TInt r = UserHal::MemoryInfo(meminfo); ASSERT(r==KErrNone); User::LeaveIfError(r); - iLowMemoryThreshold = (TInt) (meminfo().iTotalRamInBytes * (TGlobalCacheMemorySettings::LowMemoryThreshold() / 100.00)); + iLowMemoryThreshold = (meminfo().iTotalRamInBytes * TGlobalCacheMemorySettings::LowMemoryThreshold()) / 100; TChunkCreateInfo createInfo; createInfo.SetCache(iSizeInBytes); createInfo.SetOwner(EOwnerProcess); @@ -287,10 +287,6 @@ */ void CCacheMemoryManagerFactory::CreateL() { - // Panic in DEBUG mode when GlobalCacheMemorySize is set as a negative value. - ASSERT(TGlobalCacheMemorySettings::CacheSize() >= 0); - ASSERT(TGlobalCacheMemorySettings::LowMemoryThreshold() >= 0); - if (TGlobalCacheMemorySettings::CacheSize() > 0) iCacheMemoryManager = CCacheMemoryManager::NewL(TGlobalCacheMemorySettings::CacheSize()); else @@ -341,12 +337,12 @@ iLowMemoryThreshold = lowMemoryThreshold; } -TInt32 TGlobalCacheMemorySettings::CacheSize() +TInt TGlobalCacheMemorySettings::CacheSize() { return iCacheSizeInBytes; } -TInt32 TGlobalCacheMemorySettings::LowMemoryThreshold() +TInt TGlobalCacheMemorySettings::LowMemoryThreshold() { return iLowMemoryThreshold; }