From dd9fcd83f01d1e71a1813eed85462468d50cf2b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Wed, 6 Feb 2013 22:58:23 +0100 Subject: [PATCH] Fixed name clash in internal implementation. Clang didn't like that. --- src/AbstractShaderProgram.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/AbstractShaderProgram.h b/src/AbstractShaderProgram.h index 07fd6fa4f..3fd055743 100644 --- a/src/AbstractShaderProgram.h +++ b/src/AbstractShaderProgram.h @@ -1207,12 +1207,12 @@ template<> struct Attribute { } }; -template struct Attribute>: public Attribute { - inline constexpr static GLint components() { return size; } +template struct Attribute>: public Attribute { + inline constexpr static GLint components() { return size_; } }; -template struct Attribute>: public Attribute { - inline constexpr static GLint components() { return size; } +template struct Attribute>: public Attribute { + inline constexpr static GLint components() { return size_; } }; #ifndef MAGNUM_TARGET_GLES @@ -1237,14 +1237,14 @@ template struct Attribute struct Attribute>: public Attribute { - inline constexpr static GLint components() { return size; } - inline constexpr static std::size_t vectorCount() { return size; } +template struct Attribute>: public Attribute { + inline constexpr static GLint components() { return size_; } + inline constexpr static std::size_t vectorCount() { return size_; } }; -template struct Attribute>: public Attribute { - inline constexpr static GLint components() { return size; } - inline constexpr static std::size_t vectorCount() { return size; } +template struct Attribute>: public Attribute { + inline constexpr static GLint components() { return size_; } + inline constexpr static std::size_t vectorCount() { return size_; } }; #endif