Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Core/Resources/ResourceCache.cpp

Diff revisions: vs.
  @@ -9,7 +9,7 @@
9 9
10 10 ResourceCache::ResourceCache()
11 11 {
12 - //_loadingPool = New boost::threadpool::pool(3);
12 + //_loadingPool = MemoryManager_NEW boost::threadpool::pool(3);
13 13 DVDConverter::createInstance();
14 14 TerrainLoader::createInstance();
15 15 }
  @@ -20,7 +20,7 @@
20 20 TerrainLoader::destroyInstance();
21 21
22 22 Destroy();
23 - //SAFE_DELETE(_loadingPool);
23 + //DELETE(_loadingPool);
24 24 PRINT_FN(Locale::get("RESOURCE_CACHE_DELETE"));
25 25 }
26 26
  @@ -37,9 +37,9 @@
37 37 it.second->SubRef();
38 38 }
39 39 removeInternal( it.second );
40 - MemoryManager::SAFE_DELETE( it.second );
41 40 }
42 - _resDB.clear();
41 +
42 + MemoryManager::DELETE_HASHMAP(_resDB);
43 43 }
44 44
45 45 void ResourceCache::add( const stringImpl& name, Resource* const res ) {
  @@ -91,7 +91,7 @@
91 91 WriteLock w_lock( _creationMutex );
92 92 _resDB.erase( _resDB.find( nameCpy ) );
93 93 w_lock.unlock();
94 - MemoryManager::SAFE_DELETE( resource );
94 + MemoryManager::DELETE( resource );
95 95 } else {
96 96 return false;
97 97 }