diff options
author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-27 18:30:35 +0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-03-30 23:37:44 +0300 |
commit | 1c5e0ee31e82115fe7d17b6a9cdbc568f8a145e2 (patch) | |
tree | f24357c961db459a6240e75ea8965095224f56a8 /src | |
parent | 94d1c10727ceb2c0e245aeb3c255102da185440c (diff) | |
download | qtlocation-mapboxgl-1c5e0ee31e82115fe7d17b6a9cdbc568f8a145e2.tar.gz |
[core] Fix misc-* errors
As reported by clang-tidy-8.
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/annotation/shape_annotation_impl.cpp | 1 | ||||
-rw-r--r-- | src/mbgl/renderer/render_orchestrator.cpp | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mbgl/annotation/shape_annotation_impl.cpp b/src/mbgl/annotation/shape_annotation_impl.cpp index 3617315d5e..0da98acb84 100644 --- a/src/mbgl/annotation/shape_annotation_impl.cpp +++ b/src/mbgl/annotation/shape_annotation_impl.cpp @@ -11,7 +11,6 @@ namespace mbgl { using namespace style; -namespace geojsonvt = mapbox::geojsonvt; ShapeAnnotationImpl::ShapeAnnotationImpl(const AnnotationID id_) : id(id_), diff --git a/src/mbgl/renderer/render_orchestrator.cpp b/src/mbgl/renderer/render_orchestrator.cpp index d199101b52..ae66e4ab42 100644 --- a/src/mbgl/renderer/render_orchestrator.cpp +++ b/src/mbgl/renderer/render_orchestrator.cpp @@ -43,16 +43,16 @@ public: LayerRenderItem(RenderLayer& layer_, RenderSource* source_, uint32_t index_) : layer(layer_), source(source_), index(index_) {} bool operator<(const LayerRenderItem& other) const { return index < other.index; } + std::reference_wrapper<RenderLayer> layer; RenderSource* source; + const uint32_t index; private: bool hasRenderPass(RenderPass pass) const override { return layer.get().hasRenderPass(pass); } void upload(gfx::UploadPass& pass) const override { layer.get().upload(pass); } void render(PaintParameters& parameters) const override { layer.get().render(parameters); } const std::string& getName() const override { return layer.get().getID(); } - - uint32_t index; }; class RenderTreeImpl final : public RenderTree { |