From cd06b550dd95d6690daf0a34cd9733ae581ed5b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Konstantin=20K=C3=A4fer?= Date: Wed, 27 Feb 2019 13:59:49 +0100 Subject: [core] disallow subtyping of gl::Attributes<> and use type aliases instead --- src/mbgl/gl/attribute.hpp | 2 +- src/mbgl/gl/uniform.hpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/mbgl/gl') diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp index 9d8947e4e5..c572ef7d47 100644 --- a/src/mbgl/gl/attribute.hpp +++ b/src/mbgl/gl/attribute.hpp @@ -214,7 +214,7 @@ void bindAttributeLocation(Context&, ProgramID, AttributeLocation, const char * std::set getActiveAttributes(ProgramID); template -class Attributes { +class Attributes final { public: using Types = TypeList; using Locations = IndexedTuple< diff --git a/src/mbgl/gl/uniform.hpp b/src/mbgl/gl/uniform.hpp index 38a0a759b3..62e201ee4b 100644 --- a/src/mbgl/gl/uniform.hpp +++ b/src/mbgl/gl/uniform.hpp @@ -52,7 +52,7 @@ public: UniformLocation uniformLocation(ProgramID, const char * name); template -class Uniforms { +class Uniforms final { public: using Types = TypeList; using State = IndexedTuple, TypeList...>>; -- cgit v1.2.1