Introduce a typedef for uniform layout hashes in Program

[libs/gl.git] / source / programdata.h

diff --git a/source/programdata.h b/source/programdata.h
index e27265d76d5678808f242c3cb89a0553dd1bab6e..6f9242e688928bd9e001f46419a1d04562845471 100644 (file)
--- 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;