diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-06-09 11:37:00 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-07-01 15:21:11 -0700 |
| commit | 3ab682e627fa70d926908632ffbdb53694adc0d5 (patch) | |
| tree | c24b843fa97cf86ed6cf956d6467b08323860d42 /src/mbgl/text/collision_tile.hpp | |
| parent | db1202e8e335be540ded48029216ad9884fc5bb9 (diff) | |
| download | qtlocation-mapboxgl-3ab682e627fa70d926908632ffbdb53694adc0d5.tar.gz | |
Fix name shadowing
Diffstat (limited to 'src/mbgl/text/collision_tile.hpp')
| -rw-r--r-- | src/mbgl/text/collision_tile.hpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mbgl/text/collision_tile.hpp b/src/mbgl/text/collision_tile.hpp index 882f347b46..aed9b59f32 100644 --- a/src/mbgl/text/collision_tile.hpp +++ b/src/mbgl/text/collision_tile.hpp @@ -27,8 +27,8 @@ namespace mbgl { namespace bg = boost::geometry; namespace bgm = bg::model; namespace bgi = bg::index; - typedef bgm::point<float, 2, bg::cs::cartesian> Point; - typedef bgm::box<Point> Box; + typedef bgm::point<float, 2, bg::cs::cartesian> CollisionPoint; + typedef bgm::box<CollisionPoint> Box; typedef std::pair<Box, CollisionBox> CollisionTreeBox; typedef bgi::rtree<CollisionTreeBox, bgi::linear<16,4>> Tree; |