diff options
Diffstat (limited to 'src/mbgl/style/light.cpp.ejs')
| -rw-r--r-- | src/mbgl/style/light.cpp.ejs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/mbgl/style/light.cpp.ejs b/src/mbgl/style/light.cpp.ejs index 93e487f7a8..579889ab0d 100644 --- a/src/mbgl/style/light.cpp.ejs +++ b/src/mbgl/style/light.cpp.ejs @@ -11,6 +11,7 @@ #include <mbgl/style/conversion/transition_options.hpp> #include <mbgl/style/conversion/json.hpp> #include <mbgl/style/conversion_impl.hpp> +#include <mbgl/util/traits.hpp> #include <mapbox/eternal.hpp> @@ -37,7 +38,7 @@ Mutable<Light::Impl> Light::mutableImpl() const { using namespace conversion; optional<Error> Light::setProperty(const std::string& name, const Convertible& value) { - enum class Property : uint8_t { + enum class Property { <% for (const property of properties) { -%> <%- camelize(property.name) %>, <% } -%> @@ -47,8 +48,8 @@ optional<Error> Light::setProperty(const std::string& name, const Convertible& v }; MAPBOX_ETERNAL_CONSTEXPR const auto properties = mapbox::eternal::hash_map<mapbox::eternal::string, uint8_t>({ - <%- properties.map(p => `{ "${p.name}", static_cast<uint8_t>(Property::${camelize(p.name)}) }`).join(',\n ') %>, - <%- properties.map(p => `{ "${p.name}-transition", static_cast<uint8_t>(Property::${camelize(p.name)}Transition) }`).join(',\n ') %> + <%- properties.map(p => `{ "${p.name}", mbgl::underlying_type(Property::${camelize(p.name)}) }`).join(',\n ') %>, + <%- properties.map(p => `{ "${p.name}-transition", mbgl::underlying_type(Property::${camelize(p.name)}Transition) }`).join(',\n ') %> }); const auto it = properties.find(name.c_str()); |