summaryrefslogtreecommitdiff
path: root/src/mbgl/gl
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2019-02-27 13:59:49 +0100
committerKonstantin Käfer <mail@kkaefer.com>2019-03-01 09:33:37 +0100
commitcd06b550dd95d6690daf0a34cd9733ae581ed5b9 (patch)
tree437a6ebb3d158a4ad00b813e95b66fafb749915f /src/mbgl/gl
parent55c7b86053816e74c3fd3c0595c1fa053970f959 (diff)
downloadqtlocation-mapboxgl-cd06b550dd95d6690daf0a34cd9733ae581ed5b9.tar.gz
[core] disallow subtyping of gl::Attributes<> and use type aliases instead
Diffstat (limited to 'src/mbgl/gl')
-rw-r--r--src/mbgl/gl/attribute.hpp2
-rw-r--r--src/mbgl/gl/uniform.hpp2
2 files changed, 2 insertions, 2 deletions
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<std::string> getActiveAttributes(ProgramID);
template <class... As>
-class Attributes {
+class Attributes final {
public:
using Types = TypeList<As...>;
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... Us>
-class Uniforms {
+class Uniforms final {
public:
using Types = TypeList<Us...>;
using State = IndexedTuple<TypeList<Us...>, TypeList<UniformState<typename Us::Value>...>>;