X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fprogramdata.h;h=6f9242e688928bd9e001f46419a1d04562845471;hb=259254bc46e3aec6f719e1aea5e4936569c15b6e;hp=e27265d76d5678808f242c3cb89a0553dd1bab6e;hpb=2b779717e42b514210f7128cf9aee2276650e003;p=libs%2Fgl.git

diff --git a/source/programdata.h b/source/programdata.h
index e27265d7..6f9242e6 100644
--- a/source/programdata.h
+++ b/source/programdata.h
@@ -10,10 +10,10 @@ namespace Msp {
 namespace GL {
 
 class Buffer;
-class Color;
 class Matrix;
 class Uniform;
 class UniformBlock;
+struct Color;
 
 /**
 Stores uniform variables for shader programs.  The uniforms are stored in a
@@ -57,7 +57,7 @@ private:
 	};
 
 	typedef std::map<std::string, Uniform *> UniformMap;
-	typedef std::map<unsigned, Block> BlockMap;
+	typedef std::map<Program::LayoutHash, Block> BlockMap;
 
 	// XXX All these mutables are a bit silly, but I'm out of better ideas
 	UniformMap uniforms;