diff options
author | Konstantin Käfer <mail@kkaefer.com> | 2019-01-11 15:11:01 +0100 |
---|---|---|
committer | Konstantin Käfer <mail@kkaefer.com> | 2019-01-11 16:05:17 +0100 |
commit | 1185fe0d316f34ebad93807e871093f9c0df0890 (patch) | |
tree | ca8189e4e800a9f3521b1b14864d1fd1f8ce650c /src/mbgl/style/layers/line_layer_properties.hpp | |
parent | d37918c169b2f688c96fb766fc671066c88fc1a2 (diff) | |
download | qtlocation-mapboxgl-1185fe0d316f34ebad93807e871093f9c0df0890.tar.gz |
[core] return constexpr strings from functions to avoid ODR compile failures
Diffstat (limited to 'src/mbgl/style/layers/line_layer_properties.hpp')
-rw-r--r-- | src/mbgl/style/layers/line_layer_properties.hpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/style/layers/line_layer_properties.hpp b/src/mbgl/style/layers/line_layer_properties.hpp index 6f85eadafb..f6eeaa154f 100644 --- a/src/mbgl/style/layers/line_layer_properties.hpp +++ b/src/mbgl/style/layers/line_layer_properties.hpp @@ -13,22 +13,22 @@ namespace mbgl { namespace style { struct LineCap : LayoutProperty<LineCapType> { - static constexpr const char * key = "line-cap"; + static constexpr const char *name() { return "line-cap"; } static LineCapType defaultValue() { return LineCapType::Butt; } }; struct LineJoin : DataDrivenLayoutProperty<LineJoinType> { - static constexpr const char * key = "line-join"; + static constexpr const char *name() { return "line-join"; } static LineJoinType defaultValue() { return LineJoinType::Miter; } }; struct LineMiterLimit : LayoutProperty<float> { - static constexpr const char * key = "line-miter-limit"; + static constexpr const char *name() { return "line-miter-limit"; } static float defaultValue() { return 2; } }; struct LineRoundLimit : LayoutProperty<float> { - static constexpr const char * key = "line-round-limit"; + static constexpr const char *name() { return "line-round-limit"; } static float defaultValue() { return 1; } }; |