X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=b074247e8d772bc6f4b00bbb817f1363e15baaf0;hp=e9241fc0d384f3981ce5ed8b8b8e2db04ef6e8be;hb=85f9719bf3519b1f1942738d11601584f5d38725;hpb=4536fdf7952df0d8773c9bf3014fa25a50ca8ecf

diff --git a/resource_pool.cpp b/resource_pool.cpp
index e9241fc..b074247 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -36,8 +36,7 @@ ResourcePool::~ResourcePool()
 	for (list<GLuint>::const_iterator freelist_it = texture_freelist.begin();
 	     freelist_it != texture_freelist.end();
 	     ++freelist_it) {
-		GLuint free_texture_num = program_freelist.front();
-		program_freelist.pop_front();
+		GLuint free_texture_num = *freelist_it;
 		assert(texture_formats.count(free_texture_num) != 0);
 		texture_freelist_bytes -= estimate_texture_size(texture_formats[free_texture_num]);
 		texture_formats.erase(free_texture_num);
@@ -51,7 +50,7 @@ ResourcePool::~ResourcePool()
 void ResourcePool::delete_program(GLuint glsl_program_num)
 {
 	bool found_program = false;
-	for (std::map<std::pair<std::string, std::string>, GLuint>::iterator program_it = programs.begin();
+	for (map<pair<string, string>, GLuint>::iterator program_it = programs.begin();
 	     program_it != programs.end();
 	     ++program_it) {
 		if (program_it->second == glsl_program_num) {
@@ -63,7 +62,7 @@ void ResourcePool::delete_program(GLuint glsl_program_num)
 	assert(found_program);
 	glDeleteProgram(glsl_program_num);
 
-	std::map<GLuint, std::pair<GLuint, GLuint> >::iterator shader_it =
+	map<GLuint, pair<GLuint, GLuint> >::iterator shader_it =
 		program_shaders.find(glsl_program_num);
 	assert(shader_it != program_shaders.end());