From 3ab682e627fa70d926908632ffbdb53694adc0d5 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Tue, 9 Jun 2015 11:37:00 -0400
Subject: [PATCH] Fix name shadowing

---
 src/mbgl/text/collision_tile.cpp | 4 ++--
 src/mbgl/text/collision_tile.hpp | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/mbgl/text/collision_tile.cpp b/src/mbgl/text/collision_tile.cpp
index 0d1b25af5..3c2d22a5b 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 882f347b4..aed9b59f3 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;