summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2015-06-09 11:37:00 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2015-07-01 15:21:11 -0700
commit3ab682e627fa70d926908632ffbdb53694adc0d5 (patch)
treec24b843fa97cf86ed6cf956d6467b08323860d42 /src
parentdb1202e8e335be540ded48029216ad9884fc5bb9 (diff)
downloadqtlocation-mapboxgl-3ab682e627fa70d926908632ffbdb53694adc0d5.tar.gz
Fix name shadowing
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/text/collision_tile.cpp4
-rw-r--r--src/mbgl/text/collision_tile.hpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp
index 0d1b25af54..3c2d22a5b2 100644
--- a/src/mbgl/text/collision_tile.cpp
+++ b/src/mbgl/text/collision_tile.cpp
@@ -91,11 +91,11 @@ void CollisionTile::insertFeature(CollisionFeature &feature, const float minPlac
Box CollisionTile::getTreeBox(const vec2<float> &anchor, const CollisionBox &box) {
return Box{
- Point{
+ CollisionPoint{
anchor.x + box.x1,
anchor.y + box.y1 * yStretch
},
- Point{
+ CollisionPoint{
anchor.x + box.x2,
anchor.y + box.y2 * yStretch
}
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;