diff options
| author | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
|---|---|---|
| committer | Wilhelm Berg <wb@BergWerk-GIS.at> | 2018-09-12 15:07:57 +0200 |
| commit | 98b34cb0dbf5c50d7f319724c93021418140b15f (patch) | |
| tree | 11cd51f86b5c672dda6bfe087f40f77df1553971 /src/mbgl/style/expression/value.cpp | |
| parent | ee17d79f9420eb859303d977955454dacc470db6 (diff) | |
| parent | 079ba0209ed383c15123902f0810e658c2b0abf4 (diff) | |
| download | qtlocation-mapboxgl-upstream/bwg-vs2017.tar.gz | |
Merge remote-tracking branch 'origin' into bwg-vs2017upstream/bwg-vs2017
# Conflicts:
# cmake/mason-dependencies.cmake
Diffstat (limited to 'src/mbgl/style/expression/value.cpp')
| -rw-r--r-- | src/mbgl/style/expression/value.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mbgl/style/expression/value.cpp b/src/mbgl/style/expression/value.cpp index ddf1ff0ca4..f089c918cd 100644 --- a/src/mbgl/style/expression/value.cpp +++ b/src/mbgl/style/expression/value.cpp @@ -297,6 +297,9 @@ template struct ValueConverter<LineJoinType>; template type::Type valueTypeToExpressionType<SymbolPlacementType>(); template struct ValueConverter<SymbolPlacementType>; + +template type::Type valueTypeToExpressionType<SymbolZOrderType>(); +template struct ValueConverter<SymbolZOrderType>; template type::Type valueTypeToExpressionType<SymbolAnchorType>(); template struct ValueConverter<SymbolAnchorType>; |