Apparently parameter names can collide with method names for gcc?

2 files changed, 6 insertions, 6 deletions

diff --git a/src/mbgl/util/grid_index.cpp b/src/mbgl/util/grid_index.cpp
index 5869ee48ac..61589f4284 100644
--- a/src/mbgl/util/grid_index.cpp
+++ b/src/mbgl/util/grid_index.cpp
@@ -103,13 +103,13 @@ bool GridIndex<T>::hitTest(const BCircle& queryBCircle) const {
 }
 
 template <class T>
-bool GridIndex<T>::noIntersection(const BBox& query) const {
-    return query.max.x < 0 || query.min.x > width || query.max.y < 0 || query.min.y > height;
+bool GridIndex<T>::noIntersection(const BBox& queryBBox) const {
+    return queryBBox.max.x < 0 || queryBBox.min.x > width || queryBBox.max.y < 0 || queryBBox.min.y > height;
 }
 
 template <class T>
-bool GridIndex<T>::completeIntersection(const BBox& query) const {
-    return query.min.x <= 0 && query.min.y <= 0 && width <= query.max.x && height <= query.max.y;
+bool GridIndex<T>::completeIntersection(const BBox& queryBBox) const {
+    return queryBBox.min.x <= 0 && queryBBox.min.y <= 0 && width <= queryBBox.max.x && height <= queryBBox.max.y;
 }
 
 template <class T>
diff --git a/src/mbgl/util/grid_index.hpp b/src/mbgl/util/grid_index.hpp
index 46c610691f..6e42a97bd7 100644
--- a/src/mbgl/util/grid_index.hpp
+++ b/src/mbgl/util/grid_index.hpp
@@ -74,8 +74,8 @@ public:
     bool empty() const;
 
 private:
-    bool noIntersection(const BBox& query) const;
-    bool completeIntersection(const BBox& query) const;
+    bool noIntersection(const BBox& queryBBox) const;
+    bool completeIntersection(const BBox& queryBBox) const;
     BBox convertToBox(const BCircle& circle) const;
 
     void query(const BBox&, std::function<bool (const T&, const BBox&)>) const;