[build] upgrade to variant 1.1.4 and dependencies

2016-11-25 16:19:07 +01:00
parent 11281d15e9
commit 4fe071b518
12 changed files with 33 additions and 21 deletions
--- 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;