Get rid of the typedefs for fundamental types

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

diff --git a/source/vertexformat.h b/source/vertexformat.h
index 2432d7b60d54aec2fbf8e478cdfec5ff8971f90f..2164a8fb2cf9f8515bcf1cfd3a442f9a68ffd441 100644 (file)
--- a/source/vertexformat.h
+++ b/source/vertexformat.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of libmspgl
-Copyright © 2007  Mikko Rasa, Mikkosoft Productions
+Copyright © 2007, 2009-2010  Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
@@ -9,7 +9,6 @@ Distributed under the LGPL
 #define MSP_GL_VERTEXFORMAT_H_
 
 #include <istream>
-#include "types.h"
 
 namespace Msp {
 namespace GL {
@@ -46,6 +45,7 @@ struct VertexFormat
        bool empty() const { return !data || !data[0]; }
        const unsigned char *begin() const { return data ? data+1 : 0; }
        const unsigned char *end() const { return data ? data+1+data[0] : 0; }
+       unsigned stride() const;
 };
 
 VertexFormat operator,(const VertexFormat &f, VertexComponent c);
@@ -56,7 +56,9 @@ VertexFormat operator,(const VertexFormat &f, unsigned i);
 inline VertexFormat operator,(VertexComponent c, unsigned i)
 { return (VertexFormat(c), i); }
 
-uint get_stride(const VertexFormat &);
+inline unsigned get_stride(const VertexFormat &f)
+{ return f.stride(); }
+
 std::istream &operator>>(std::istream &, VertexFormat &);
 
 } // namespace GL