Get rid of the typedefs for fundamental types

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

diff --git a/source/shader.h b/source/shader.h
index dfa5af3b5c18da91ed15fd062b32f7d5f8568ff0..86a70be0e10eb5716b2b296d17e7998c6a8c9e1a 100644 (file)
--- a/source/shader.h
+++ b/source/shader.h
@@ -9,8 +9,7 @@ Distributed under the LGPL
 #define MSP_GL_SHADER_H_
 
 #include <string>
-#include <GL/gl.h>
-#include "types.h"
+#include "gl.h"
 
 namespace Msp {
 namespace GL {
@@ -26,18 +25,21 @@ class Shader
 public:
        Shader(ShaderType t);
        Shader(ShaderType t, const std::string &);
+private:
+       void init(ShaderType);
+public:
        ~Shader();
 
-       void source(sizei count, const char **str, const int *len);
+       void source(unsigned count, const char **str, const int *len);
        void source(const std::string &str);
        void source(const char *str, int len);
        void compile();
-       uint get_id() const { return id; }
+       unsigned get_id() const { return id; }
        bool get_compiled() const { return compiled; }
        int get_param(GLenum param) const;
        std::string get_info_log() const;
 private:
-       uint id;
+       unsigned id;
        bool compiled;
 };