diff options
Diffstat (limited to 'src/mbgl/style/properties.hpp')
-rw-r--r-- | src/mbgl/style/properties.hpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/mbgl/style/properties.hpp b/src/mbgl/style/properties.hpp index 24ac030541..e42beac97a 100644 --- a/src/mbgl/style/properties.hpp +++ b/src/mbgl/style/properties.hpp @@ -130,7 +130,10 @@ public: class PossiblyEvaluated : public Tuple<PossiblyEvaluatedTypes> { public: - using Tuple<PossiblyEvaluatedTypes>::Tuple; + template <class... Us> + PossiblyEvaluated(Us&&... us) + : Tuple<PossiblyEvaluatedTypes>(std::forward<Us>(us)...) { + } template <class T> static T evaluate(float, const GeometryTileFeature&, const T& t, const T&) { @@ -214,5 +217,13 @@ public: }; }; +template <class...> +struct ConcatenateProperties; + +template <class... As, class... Bs> +struct ConcatenateProperties<TypeList<As...>, TypeList<Bs...>> { + using Type = Properties<As..., Bs...>; +}; + } // namespace style } // namespace mbgl |