diff options
author | Anand Thakker <github@anandthakker.net> | 2018-04-12 11:36:23 -0400 |
---|---|---|
committer | Anand Thakker <github@anandthakker.net> | 2018-04-12 11:36:23 -0400 |
commit | 6f33fc3e90364ef6adb18e970b0149ffc78d3a8e (patch) | |
tree | b81c113d3e7a5cb8afec19aaa1234227aaa8163d | |
parent | 44e22f218c3098abf7886a0315fee9e9bf0257bc (diff) | |
download | qtlocation-mapboxgl-upstream/fix-11594.tar.gz |
Fix ambiguous constructor callupstream/fix-11594
-rw-r--r-- | include/mbgl/style/conversion/heatmap_color_property_value.hpp | 2 | ||||
-rw-r--r-- | src/mbgl/style/conversion/filter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/conversion/heatmap_color_property_value.hpp b/include/mbgl/style/conversion/heatmap_color_property_value.hpp index 736506e154..8ed37aacac 100644 --- a/include/mbgl/style/conversion/heatmap_color_property_value.hpp +++ b/include/mbgl/style/conversion/heatmap_color_property_value.hpp @@ -21,7 +21,7 @@ struct Converter<HeatmapColorPropertyValue> { if (isUndefined(value)) { return HeatmapColorPropertyValue(); } else if (isExpression(value)) { - ParsingContext ctx({type::Color}); + ParsingContext ctx(optional<type::Type>{type::Color}); ParseResult expression = ctx.parseLayerPropertyExpression(value); if (!expression) { error = { ctx.getCombinedErrors() }; diff --git a/src/mbgl/style/conversion/filter.cpp b/src/mbgl/style/conversion/filter.cpp index 5375c1377b..fbcdc325e8 100644 --- a/src/mbgl/style/conversion/filter.cpp +++ b/src/mbgl/style/conversion/filter.cpp @@ -236,7 +236,7 @@ optional<Filter> convertCompoundFilter(const Convertible& value, Error& error) { } optional<Filter> convertExpressionFilter(const Convertible& value, Error& error) { - expression::ParsingContext ctx({expression::type::Boolean}); + expression::ParsingContext ctx(optional<expression::type::Type>{expression::type::Boolean}); expression::ParseResult expression = ctx.parseExpression(value); if (!expression) { error = { ctx.getCombinedErrors() }; |