X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresources%2Fresourcemanager.cpp;h=91acb3d0baf623e89fea7777cd022006ec847401;hp=4bac0aec841aa1552f3062a42a93f57ea2b7fb31;hb=5b311d10d50aa1fe0eb4ed4b8e41f0c58e9e7cbf;hpb=e9a898f315b5d1396f196d785913a283c30940f2

diff --git a/source/resources/resourcemanager.cpp b/source/resources/resourcemanager.cpp
index 4bac0aec..91acb3d0 100644
--- a/source/resources/resourcemanager.cpp
+++ b/source/resources/resourcemanager.cpp
@@ -214,7 +214,7 @@ void ResourceManager::tick()
 
 void ResourceManager::dispatch_work()
 {
-	queue.sort(age_order);
+	sort(queue, age_order);
 
 	if(queue.front()->last_used+min_retain_frames<frame)
 	{
@@ -406,7 +406,8 @@ void ResourceManager::LoadingThread::main()
 			}
 
 			MutexLock lock(queue_mutex);
-			sync_queue.splice(sync_queue.end(), async_queue, async_queue.begin());
+			sync_queue.push_back(async_queue.front());
+			async_queue.pop_front();
 			wait_for_work = async_queue.empty();
 		}
 		else
@@ -414,7 +415,7 @@ void ResourceManager::LoadingThread::main()
 	}
 }
 
-ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(list<ManagedResource *> &que)
+ResourceManager::ManagedResource *ResourceManager::LoadingThread::front(deque<ManagedResource *> &que)
 {
 	MutexLock lock(queue_mutex);
 	if(que.empty())
@@ -519,7 +520,8 @@ bool ResourceManager::LoadingThread::sync()
 		{
 			MutexLock lock(queue_mutex);
 			bool was_empty = async_queue.empty();
-			async_queue.splice(async_queue.end(), sync_queue, sync_queue.begin());
+			async_queue.push_back(sync_queue.front());
+			sync_queue.pop_front();
 			if(was_empty)
 				sem.signal();
 		}