diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-06-01 11:49:15 +0200 |
|---|---|---|
| committer | Molly Lloyd <mollymerp@users.noreply.github.com> | 2018-08-31 13:08:47 -0700 |
| commit | 5e9bbfdd44ef9c0a2c5850566c28a40aa2a05151 (patch) | |
| tree | c988c26ea070063adb4a584485625ac5e7ec2ec5 /src/mbgl/style | |
| parent | 748e6bde5f611cfba3419c272d3cbf1d5c1350ef (diff) | |
| download | qtlocation-mapboxgl-5e9bbfdd44ef9c0a2c5850566c28a40aa2a05151.tar.gz | |
[core] introduce TypeListConcat and TypeList::ExpandInto
Diffstat (limited to 'src/mbgl/style')
| -rw-r--r-- | src/mbgl/style/properties.hpp | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mbgl/style/properties.hpp b/src/mbgl/style/properties.hpp index 9206e96982..e7f05db959 100644 --- a/src/mbgl/style/properties.hpp +++ b/src/mbgl/style/properties.hpp @@ -233,13 +233,8 @@ public: }; }; -template <class...> -struct ConcatenateProperties; - -template <class... As, class... Bs> -struct ConcatenateProperties<TypeList<As...>, TypeList<Bs...>> { - using Type = Properties<As..., Bs...>; -}; +template <class... Ps> +using ConcatenateProperties = typename TypeListConcat<typename Ps::PropertyTypes...>::template ExpandInto<Properties>; } // namespace style } // namespace mbgl |