diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2016-11-25 16:19:07 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2016-11-28 18:02:00 +0100 |
commit | 4fe071b518e792fdf069eb81ac326cf0f27f5e73 (patch) | |
tree | 692a820f2f93efa60f3cec07e2c2af35845fd6bc /src | |
parent | 11281d15e9c36b82dda3361c518161fb11c13ef9 (diff) | |
download | qtlocation-mapboxgl-4fe071b518e792fdf069eb81ac326cf0f27f5e73.tar.gz |
[build] upgrade to variant 1.1.4 and dependencies
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/annotation/annotation_tile.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/map/map.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/annotation/annotation_tile.hpp b/src/mbgl/annotation/annotation_tile.hpp index d43ec82d38..bf73075992 100644 --- a/src/mbgl/annotation/annotation_tile.hpp +++ b/src/mbgl/annotation/annotation_tile.hpp @@ -31,7 +31,7 @@ public: FeatureType getType() const override { return type; } optional<Value> getValue(const std::string&) const override; - optional<FeatureIdentifier> getID() const override { return { id }; } + optional<FeatureIdentifier> getID() const override { return { static_cast<uint64_t>(id) }; } GeometryCollection getGeometries() const override { return geometries; } const AnnotationID id; diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index 3b8758f987..8577002c04 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -825,7 +825,8 @@ AnnotationIDs Map::queryPointAnnotations(const ScreenBox& box) { std::set<AnnotationID> set; for (auto &feature : features) { assert(feature.id); - assert(*feature.id <= std::numeric_limits<AnnotationID>::max()); + assert(feature.id->is<uint64_t>()); + assert(feature.id->get<uint64_t>() <= std::numeric_limits<AnnotationID>::max()); set.insert(static_cast<AnnotationID>(feature.id->get<uint64_t>())); } AnnotationIDs ids; |