diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2019-03-12 16:23:36 +0100 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2019-03-21 13:48:13 +0100 |
| commit | f5d3cc5a3f5b9ceb6d8ba439dd7b8a879958e790 (patch) | |
| tree | aa2f5cc027715d3595e64e724e8e5aee78f4a58c | |
| parent | 808c1b1867547bc8ff45b97cbc8ec7e11af4c967 (diff) | |
| download | qtlocation-mapboxgl-f5d3cc5a3f5b9ceb6d8ba439dd7b8a879958e790.tar.gz | |
[core] mark PaintPropertyBinder subclasses as final
| -rw-r--r-- | src/mbgl/renderer/paint_property_binder.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mbgl/renderer/paint_property_binder.hpp b/src/mbgl/renderer/paint_property_binder.hpp index 7d3e147990..0f0177cfdb 100644 --- a/src/mbgl/renderer/paint_property_binder.hpp +++ b/src/mbgl/renderer/paint_property_binder.hpp @@ -122,7 +122,7 @@ public: void setPatternParameters(const optional<ImagePosition>&, const optional<ImagePosition>&, CrossfadeParameters&) override {}; std::tuple<optional<gl::AttributeBinding>> attributeBinding(const PossiblyEvaluatedPropertyValue<T>&) const override { - return std::tuple<optional<gl::AttributeBinding>> {}; + return {}; } std::tuple<float> interpolationFactor(float) const override { @@ -157,7 +157,7 @@ public: std::tuple<optional<gl::AttributeBinding>, optional<gl::AttributeBinding>> attributeBinding(const PossiblyEvaluatedPropertyValue<Faded<T>>&) const override { - return std::tuple<optional<gl::AttributeBinding>, optional<gl::AttributeBinding>> {}; + return {}; } std::tuple<float, float> interpolationFactor(float) const override { @@ -204,7 +204,7 @@ public: if (currentValue.isConstant()) { return {}; } else { - return std::tuple<optional<gl::AttributeBinding>>{ + return std::tuple<optional<gfx::AttributeBinding>>{ gl::attributeBinding<0>(*vertexBuffer) }; } @@ -268,7 +268,7 @@ public: if (currentValue.isConstant()) { return {}; } else { - return std::tuple<optional<gl::AttributeBinding>>{ + return std::tuple<optional<gfx::AttributeBinding>>{ gl::attributeBinding<0>(*vertexBuffer) }; } @@ -362,7 +362,7 @@ public: if (currentValue.isConstant()) { return {}; } else { - return std::tuple<optional<gl::AttributeBinding>, optional<gl::AttributeBinding>>{ + return std::tuple<optional<gfx::AttributeBinding>, optional<gfx::AttributeBinding>>{ gl::attributeBinding<0>(*patternToVertexBuffer), gl::attributeBinding<0>(crossfade.fromScale == 2 ? *zoomInVertexBuffer : *zoomOutVertexBuffer) }; |