summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-27 18:30:35 +0200
committerThiago Marcos P. Santos <tmpsantos@gmail.com>2020-03-30 23:37:44 +0300
commit1c5e0ee31e82115fe7d17b6a9cdbc568f8a145e2 (patch)
treef24357c961db459a6240e75ea8965095224f56a8
parent94d1c10727ceb2c0e245aeb3c255102da185440c (diff)
downloadqtlocation-mapboxgl-1c5e0ee31e82115fe7d17b6a9cdbc568f8a145e2.tar.gz
[core] Fix misc-* errors
As reported by clang-tidy-8.
-rw-r--r--platform/default/src/mbgl/storage/sqlite3.cpp2
-rw-r--r--platform/node/src/node_map.cpp2
-rw-r--r--src/mbgl/annotation/shape_annotation_impl.cpp1
-rw-r--r--src/mbgl/renderer/render_orchestrator.cpp4
4 files changed, 4 insertions, 5 deletions
diff --git a/platform/default/src/mbgl/storage/sqlite3.cpp b/platform/default/src/mbgl/storage/sqlite3.cpp
index 03c1c2e44d..de389e5431 100644
--- a/platform/default/src/mbgl/storage/sqlite3.cpp
+++ b/platform/default/src/mbgl/storage/sqlite3.cpp
@@ -132,7 +132,7 @@ mapbox::util::variant<Database, Exception> Database::tryOpen(const std::string &
Database Database::open(const std::string &filename, int flags) {
auto result = tryOpen(filename, flags);
if (result.is<Exception>()) {
- throw result.get<Exception>();
+ throw std::move(result.get<Exception>());
} else {
return std::move(result.get<Database>());
}
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index bbd8bcfa05..d9dbdaf018 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -315,7 +315,7 @@ NodeMap::RenderOptions NodeMap::ParseOptions(v8::Local<v8::Object> obj) {
if (auto light = mbgl::style::conversion::convert<mbgl::style::Light>(lightObj, conversionError)) {
options.light = *light;
} else {
- throw conversionError;
+ throw std::move(conversionError);
}
}
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 {