diff options
| author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-10 18:20:29 +0300 |
|---|---|---|
| committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-05-12 18:07:36 +0300 |
| commit | ba3afd5ae00d9137bff11c13428be7f1a9afff3e (patch) | |
| tree | 4d0080d7befdcc603e0c362181b2762fcbdaaa34 | |
| parent | 5d89f6cd928ba1f0a6541384337622ff663567de (diff) | |
| download | qtlocation-mapboxgl-ba3afd5ae00d9137bff11c13428be7f1a9afff3e.tar.gz | |
[core] Explicitly use mbgl::optional in IdentityStops::evaluate
error: call to constructor of 'optional<std::array<float, 2> >' (aka
'std::experimental::fundamentals_v1::optional<std::array<float, 2> >')
is ambiguous [clang-diagnostic-error]
| -rw-r--r-- | src/mbgl/style/function/identity_stops.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mbgl/style/function/identity_stops.cpp b/src/mbgl/style/function/identity_stops.cpp index dfb34e9dd4..4c9d01d086 100644 --- a/src/mbgl/style/function/identity_stops.cpp +++ b/src/mbgl/style/function/identity_stops.cpp @@ -51,10 +51,11 @@ optional<std::array<float, 2>> IdentityStops<std::array<float, 2>>::evaluate(con return {}; } - return {{{ + std::array<float, 2> array {{ *numericValue<float>(vector[0]), *numericValue<float>(vector[1]) - }}}; + }}; + return array; } } // namespace style |