diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-13 13:50:27 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-09-16 09:00:54 -0700 |
| commit | a8dd1bbbb8f9053923179fd45b2dfcbb86e3f474 (patch) | |
| tree | fac3c39d91b7060ff1659e55df64cd7f8a8143df /src/mbgl/layout/merge_lines.hpp | |
| parent | 1f375581c3a31adea9281a7494a73e5c8f1c9a17 (diff) | |
| download | qtlocation-mapboxgl-a8dd1bbbb8f9053923179fd45b2dfcbb86e3f474.tar.gz | |
[core] Move SymbolInstance and SymbolFeature into their own files
Diffstat (limited to 'src/mbgl/layout/merge_lines.hpp')
| -rw-r--r-- | src/mbgl/layout/merge_lines.hpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/mbgl/layout/merge_lines.hpp b/src/mbgl/layout/merge_lines.hpp index bb4c01f6a2..4cce39a652 100644 --- a/src/mbgl/layout/merge_lines.hpp +++ b/src/mbgl/layout/merge_lines.hpp @@ -1,11 +1,15 @@ #pragma once +#include <mbgl/tile/geometry_tile_data.hpp> + #include <unordered_map> #include <string> #include <vector> -#include <mbgl/layout/symbol_layout.hpp> namespace mbgl { + +class SymbolFeature; + namespace util { unsigned int mergeFromRight(std::vector<SymbolFeature> &features, |