diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-07-29 18:27:59 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-07-29 18:27:59 +0200 |
| commit | fa3a41136ca6345f34b53a1f211926cc1bd8649c (patch) | |
| tree | 457f0d528b02356e310f9d3a3f1f1859cc63dd8d /include/mbgl/style/style_parser.hpp | |
| parent | 270c24a9a8c8a02e62132cd4cb7b8aac2c1e6de5 (diff) | |
| download | qtlocation-mapboxgl-fa3a41136ca6345f34b53a1f211926cc1bd8649c.tar.gz | |
merge text and icon buckets/styles
(we're not yet placing together!)
Diffstat (limited to 'include/mbgl/style/style_parser.hpp')
| -rw-r--r-- | include/mbgl/style/style_parser.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/style_parser.hpp b/include/mbgl/style/style_parser.hpp index 431e3af8db..8b8dc74f21 100644 --- a/include/mbgl/style/style_parser.hpp +++ b/include/mbgl/style/style_parser.hpp @@ -62,8 +62,8 @@ private: // Parses optional properties into a render bucket. template<typename T> bool parseRenderProperty(JSVal value, T &target, const char *name); - template <typename T, typename Parser> - bool parseRenderProperty(JSVal value, T &target, const char *name, Parser &parser); + template <typename Parser, typename T> + bool parseRenderProperty(JSVal value, T &target, const char *name); // Parses optional properties into style class properties. template <typename T> |