[core] GCC 4.9 does not fully support custom variable templates

8 files changed, 24 insertions, 24 deletions

diff --git a/include/mbgl/style/conversion/function.hpp b/include/mbgl/style/conversion/function.hpp
index bf5b27a9a6..752b6dd045 100644
--- a/include/mbgl/style/conversion/function.hpp
+++ b/include/mbgl/style/conversion/function.hpp
@@ -156,7 +156,7 @@ struct StopsConverter<T, variant<Ts...>> {
 public:
     template <class V>
     optional<variant<Ts...>> operator()(const V& value, Error& error) const {
-        std::string type = util::Interpolatable<T> ? "exponential" : "interval";
+        std::string type = util::Interpolatable<T>::value ? "exponential" : "interval";
 
         auto typeValue = objectMember(value, "type");
         if (typeValue && toString(*typeValue)) {
diff --git a/include/mbgl/style/function/camera_function.hpp b/include/mbgl/style/function/camera_function.hpp
index 0fd5bcb078..7fde365b3d 100644
--- a/include/mbgl/style/function/camera_function.hpp
+++ b/include/mbgl/style/function/camera_function.hpp
@@ -12,7 +12,7 @@ template <class T>
 class CameraFunction {
 public:
     using Stops = std::conditional_t<
-        util::Interpolatable<T>,
+        util::Interpolatable<T>::value,
         variant<
             ExponentialStops<T>,
             IntervalStops<T>>,
diff --git a/include/mbgl/style/function/composite_function.hpp b/include/mbgl/style/function/composite_function.hpp
index 43599cd333..7b524b6021 100644
--- a/include/mbgl/style/function/composite_function.hpp
+++ b/include/mbgl/style/function/composite_function.hpp
@@ -24,7 +24,7 @@ template <class T>
 class CompositeFunction {
 public:
     using InnerStops = std::conditional_t<
-        util::Interpolatable<T>,
+        util::Interpolatable<T>::value,
         variant<
             ExponentialStops<T>,
             IntervalStops<T>,
@@ -34,7 +34,7 @@ public:
             CategoricalStops<T>>>;
 
     using Stops = std::conditional_t<
-        util::Interpolatable<T>,
+        util::Interpolatable<T>::value,
         variant<
             CompositeExponentialStops<T>,
             CompositeIntervalStops<T>,
diff --git a/include/mbgl/style/function/source_function.hpp b/include/mbgl/style/function/source_function.hpp
index 2872c63a64..9c2ad101ec 100644
--- a/include/mbgl/style/function/source_function.hpp
+++ b/include/mbgl/style/function/source_function.hpp
@@ -16,7 +16,7 @@ template <class T>
 class SourceFunction {
 public:
     using Stops = std::conditional_t<
-        util::Interpolatable<T>,
+        util::Interpolatable<T>::value,
         variant<
             ExponentialStops<T>,
             IntervalStops<T>,
diff --git a/include/mbgl/util/indexed_tuple.hpp b/include/mbgl/util/indexed_tuple.hpp
index a414639530..fd0b931d36 100644
--- a/include/mbgl/util/indexed_tuple.hpp
+++ b/include/mbgl/util/indexed_tuple.hpp
@@ -31,16 +31,13 @@ public:
     using std::tuple<Ts...>::tuple;
 
     template <class I>
-    static constexpr std::size_t Index = TypeIndex<I, Is...>::value;
-
-    template <class I>
     auto& get() {
-        return std::get<Index<I>>(*this);
+        return std::get<TypeIndex<I, Is...>::value>(*this);
     }
 
     template <class I>
     const auto& get() const {
-        return std::get<Index<I>>(*this);
+        return std::get<TypeIndex<I, Is...>::value>(*this);
     }
 
     template <class... Js, class... Us>
diff --git a/include/mbgl/util/interpolate.hpp b/include/mbgl/util/interpolate.hpp
index a2103f18b2..6738987598 100644
--- a/include/mbgl/util/interpolate.hpp
+++ b/include/mbgl/util/interpolate.hpp
@@ -95,7 +95,11 @@ struct Interpolator<std::vector<T>>
     : Uninterpolated {};
 
 template <class T>
-constexpr bool Interpolatable = !std::is_base_of<Uninterpolated, Interpolator<T>>::value;
+struct Interpolatable
+    : std::conditional_t<
+      !std::is_base_of<Uninterpolated, Interpolator<T>>::value,
+      std::true_type,
+      std::false_type> {};
 
 } // namespace util
 } // namespace mbgl
diff --git a/src/mbgl/gl/attribute.cpp b/src/mbgl/gl/attribute.cpp
index 4e6f78e689..4569e3cb32 100644
--- a/src/mbgl/gl/attribute.cpp
+++ b/src/mbgl/gl/attribute.cpp
@@ -55,14 +55,16 @@ void DisabledAttribute::bind(Context&, AttributeLocation location, std::size_t)
     MBGL_CHECK_ERROR(glDisableVertexAttribArray(location));
 }
 
-template <class T> DataType DataTypeOf    = static_cast<DataType>(0);
-template <> DataType DataTypeOf< int8_t>  = DataType::Byte;
-template <> DataType DataTypeOf<uint8_t>  = DataType::UnsignedByte;
-template <> DataType DataTypeOf< int16_t> = DataType::Short;
-template <> DataType DataTypeOf<uint16_t> = DataType::UnsignedShort;
-template <> DataType DataTypeOf< int32_t> = DataType::Integer;
-template <> DataType DataTypeOf<uint32_t> = DataType::UnsignedInteger;
-template <> DataType DataTypeOf<float>    = DataType::Float;
+template <class T>
+constexpr DataType DataTypeOf() {
+    return std::is_same<T,   int8_t>::value ? DataType::Byte :
+           std::is_same<T,  uint8_t>::value ? DataType::UnsignedByte :
+           std::is_same<T,  int16_t>::value ? DataType::Short :
+           std::is_same<T, uint16_t>::value ? DataType::UnsignedShort :
+           std::is_same<T,  int32_t>::value ? DataType::Integer :
+           std::is_same<T, uint32_t>::value ? DataType::UnsignedInteger :
+           std::is_same<T,    float>::value ? DataType::Float : static_cast<DataType>(0);
+}
 
 template <class T, std::size_t N>
 void AttributeBinding<T, N>::bind(Context& context, AttributeLocation location, std::size_t vertexOffset) const {
@@ -76,7 +78,7 @@ void AttributeBinding<T, N>::bind(Context& context, AttributeLocation location,
     MBGL_CHECK_ERROR(glVertexAttribPointer(
         location,
         static_cast<GLint>(attributeSize),
-        static_cast<GLenum>(DataTypeOf<T>),
+        static_cast<GLenum>(DataTypeOf<T>()),
         static_cast<GLboolean>(false),
         static_cast<GLsizei>(vertexSize),
         reinterpret_cast<GLvoid*>(attributeOffset + (vertexSize * vertexOffset))));
diff --git a/src/mbgl/gl/attribute.hpp b/src/mbgl/gl/attribute.hpp
index f018a1d261..bc02b54bd2 100644
--- a/src/mbgl/gl/attribute.hpp
+++ b/src/mbgl/gl/attribute.hpp
@@ -240,9 +240,6 @@ public:
 
     using Vertex = detail::Vertex<typename As::Type...>;
 
-    template <class A>
-    static constexpr std::size_t Index = TypeIndex<A, As...>::value;
-
     static Locations bindLocations(const ProgramID& id) {
         std::set<std::string> activeAttributes = getActiveAttributes(id);
 
@@ -266,7 +263,7 @@ public:
 
     template <class DrawMode>
     static Bindings bindings(const VertexBuffer<Vertex, DrawMode>& buffer) {
-        return Bindings { As::Type::binding(buffer, Index<As>)... };
+        return Bindings { As::Type::binding(buffer, TypeIndex<As, As...>::value)... };
     }
 
     static void bind(Context& context,