summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJulian Rex <julian.rex@mapbox.com>2018-11-22 00:55:02 -0500
committerJulian Rex <julian.rex@mapbox.com>2019-01-12 14:36:51 -0500
commitdba896ce2ded8df7c8fc4f66aa7bd7dd8f8c4aa0 (patch)
tree7d0d78d9703003f4b0e4201f49d3dc0cb97396fd /include
parentda5fdf642bae1fd5dc5928fc2627ed3047a8d657 (diff)
downloadqtlocation-mapboxgl-dba896ce2ded8df7c8fc4f66aa7bd7dd8f8c4aa0.tar.gz
Compile fixes following rebase
Diffstat (limited to 'include')
-rw-r--r--include/mbgl/style/sources/geojson_source.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/mbgl/style/sources/geojson_source.hpp b/include/mbgl/style/sources/geojson_source.hpp
index 36cc9bb4bb..a2c3c8f7d7 100644
--- a/include/mbgl/style/sources/geojson_source.hpp
+++ b/include/mbgl/style/sources/geojson_source.hpp
@@ -35,8 +35,8 @@ public:
void setGeoJSON(const GeoJSON&);
optional<std::string> getURL() const;
- mapbox::geometry::feature_collection<double> getChildren(const std::uint32_t) const;
- mapbox::geometry::feature_collection<double> getLeaves(const std::uint32_t, const std::uint32_t, const std::uint32_t) const;
+ mapbox::feature::feature_collection<double> getChildren(const std::uint32_t) const;
+ mapbox::feature::feature_collection<double> getLeaves(const std::uint32_t, const std::uint32_t, const std::uint32_t) const;
std::uint8_t getClusterExpansionZoom(std::uint32_t) const;
class Impl;