diff options
| author | Molly Lloyd <molly@mapbox.com> | 2018-06-14 14:35:39 -0700 |
|---|---|---|
| committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
| commit | 4a5dc37245d23805d13865f5ef9c5f26e539a9ca (patch) | |
| tree | de77bfeff6f7afbe02210c9189bf72da59293083 /include | |
| parent | ec62e321531b1a836074056e86de8e20018280fb (diff) | |
| download | qtlocation-mapboxgl-4a5dc37245d23805d13865f5ef9c5f26e539a9ca.tar.gz | |
[core] Implement CrossFadedDataDrivenProperty to add support for feature expressions in `*-pattern` properties
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/util/indexed_tuple.hpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/include/mbgl/util/indexed_tuple.hpp b/include/mbgl/util/indexed_tuple.hpp index cd8c0fecbb..d1a9e226b1 100644 --- a/include/mbgl/util/indexed_tuple.hpp +++ b/include/mbgl/util/indexed_tuple.hpp @@ -28,8 +28,6 @@ class IndexedTuple<TypeList<Is...>, TypeList<Ts...>> : public tuple_polyfill<Ts. public: static_assert(sizeof...(Is) == sizeof...(Ts), "IndexedTuple size mismatch"); - using tuple_polyfill<Ts...>::tuple; - template <class I> auto& get() { return get_polyfill<TypeIndex<I, Is...>::value>(*this); @@ -40,6 +38,9 @@ public: return get_polyfill<TypeIndex<I, Is...>::value>(*this); } + template <class... Us> + IndexedTuple(Us&&... other) : tuple_polyfill<Ts...>(std::forward<Us>(other)...) {} + template <class... Js, class... Us> IndexedTuple<TypeList<Is..., Js...>, TypeList<Ts..., Us...>> concat(const IndexedTuple<TypeList<Js...>, TypeList<Us...>>& other) const { |