From 47f1133c257881e4713adc33d40da3f7fa990a92 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 4 May 2011 16:36:35 +0000 Subject: [PATCH] From Mathias Froehlich, build fix for gcc 4.6 --- .../tristripper/include/public_types.h | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/osgUtil/tristripper/include/public_types.h b/src/osgUtil/tristripper/include/public_types.h index 66cca5cf1..1d795c082 100644 --- a/src/osgUtil/tristripper/include/public_types.h +++ b/src/osgUtil/tristripper/include/public_types.h @@ -11,6 +11,7 @@ #define TRI_STRIPPER_HEADER_GUARD_PUBLIC_TYPES_H #include +#include @@ -18,22 +19,22 @@ namespace triangle_stripper { - typedef size_t index; - typedef std::vector indices; + typedef size_t index; + typedef std::vector indices; - enum primitive_type - { - TRIANGLES = 0x0004, // = GL_TRIANGLES - TRIANGLE_STRIP = 0x0005 // = GL_TRIANGLE_STRIP - }; + enum primitive_type + { + TRIANGLES = 0x0004, // = GL_TRIANGLES + TRIANGLE_STRIP = 0x0005 // = GL_TRIANGLE_STRIP + }; - struct primitive_group - { - indices Indices; - primitive_type Type; - }; + struct primitive_group + { + indices Indices; + primitive_type Type; + }; - typedef std::vector primitive_vector; + typedef std::vector primitive_vector; }