X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resource_pool.cpp;h=81a6bd4afc7f1f09f8083d9eef02e2ec8e5c679d;hp=6eadd9069538a473a7e419f2b60a27f1df331743;hb=9224f01a362117deef6f1140c6802fde256fb168;hpb=f270222986351338627231f5d082f884b5d08101

diff --git a/resource_pool.cpp b/resource_pool.cpp
index 6eadd90..81a6bd4 100644
--- a/resource_pool.cpp
+++ b/resource_pool.cpp
@@ -1,14 +1,15 @@
-#include "resource_pool.h"
-
-#include <stdio.h>
+#include <assert.h>
 #include <pthread.h>
-
+#include <stdio.h>
+#include <stdlib.h>
 #include <algorithm>
 #include <map>
 #include <string>
 #include <utility>
 
+#include "glew.h"
 #include "init.h"
+#include "resource_pool.h"
 #include "util.h"
 
 using namespace std;
@@ -50,7 +51,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) {
@@ -62,7 +63,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());