From ba3afd5ae00d9137bff11c13428be7f1a9afff3e Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Wed, 10 May 2017 18:20:29 +0300
Subject: [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]
---
 src/mbgl/style/function/identity_stops.cpp | 5 +++--
 1 file 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
-- 
cgit v1.2.1