diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-11 12:48:07 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-09-13 15:55:34 -0700 |
| commit | 2c48b5a292f315feb1aa53a3a61b629bfe5f4a05 (patch) | |
| tree | 53d35e83a5a52030629593074a3596d2a5818f7e /src/mbgl/style/conversion/function.cpp | |
| parent | c044dd88b22ca081a7256fe663acf7e3ebf284d8 (diff) | |
| download | qtlocation-mapboxgl-2c48b5a292f315feb1aa53a3a61b629bfe5f4a05.tar.gz | |
[core] Implement array assertion fallback behavior
This was added in gl-js in #7095.
Diffstat (limited to 'src/mbgl/style/conversion/function.cpp')
| -rw-r--r-- | src/mbgl/style/conversion/function.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mbgl/style/conversion/function.cpp b/src/mbgl/style/conversion/function.cpp index 2ce2f4eafd..7cc599be1d 100644 --- a/src/mbgl/style/conversion/function.cpp +++ b/src/mbgl/style/conversion/function.cpp @@ -6,7 +6,6 @@ #include <mbgl/style/expression/interpolate.hpp> #include <mbgl/style/expression/match.hpp> #include <mbgl/style/expression/case.hpp> -#include <mbgl/style/expression/array_assertion.hpp> #include <mbgl/util/string.hpp> #include <cassert> @@ -679,8 +678,7 @@ optional<std::unique_ptr<Expression>> convertFunctionToExpression(type::Type typ return toColor(get(literal(*property))); }, [&] (const type::Array& array) -> optional<std::unique_ptr<Expression>> { - return std::unique_ptr<Expression>( - std::make_unique<ArrayAssertion>(array, get(literal(*property)))); + return assertion(array, get(literal(*property))); }, [&] (const auto&) -> optional<std::unique_ptr<Expression>> { assert(false); // No properties use this type. |