Fix name shadowing

mapbox · Jun 9, 2015 · 7b002f2 · 7b002f2
1 parent ac2e440
commit 7b002f2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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;