From 6282b28b6fe218390b843a8a71bb5cc2b63dd05c Mon Sep 17 00:00:00 2001
From: Bruno de Oliveira Abinader <bruno@mapbox.com>
Date: Tue, 11 Jul 2017 15:32:51 +0300
Subject: [core] Added MBGL_CONSTEXPR to satisfy GCC 4.9

---
 include/mbgl/util/convert.hpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'include/mbgl/util/convert.hpp')

diff --git a/include/mbgl/util/convert.hpp b/include/mbgl/util/convert.hpp
index c2b3d9950d..bedb1a4a08 100644
--- a/include/mbgl/util/convert.hpp
+++ b/include/mbgl/util/convert.hpp
@@ -1,3 +1,5 @@
+#include <mbgl/util/util.hpp>
+
 #include <array>
 #include <type_traits>
 #include <utility>
@@ -7,7 +9,7 @@ namespace util {
 
 template<typename To, typename From, std::size_t Size,
          typename = std::enable_if_t<std::is_convertible<From, To>::value>>
-constexpr std::array<To, Size> convert(const std::array<From, Size>&from) {
+MBGL_CONSTEXPR std::array<To, Size> convert(const std::array<From, Size>&from) {
     std::array<To, Size> to {};
     std::copy(std::begin(from), std::end(from), std::begin(to));
     return to;
-- 
cgit v1.2.1