From a070551af3fdd44e92c9554027959f4a00e1fbdb Mon Sep 17 00:00:00 2001
From: scrawl <scrawl@baseoftrash.de>
Date: Wed, 15 Mar 2017 17:51:00 +0100
Subject: [PATCH] Attempt to fix naming conflict on windows

---
 components/terrain/quadtreeworld.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/components/terrain/quadtreeworld.cpp b/components/terrain/quadtreeworld.cpp
index d65b1d5ed..f2a80d673 100644
--- a/components/terrain/quadtreeworld.cpp
+++ b/components/terrain/quadtreeworld.cpp
@@ -37,7 +37,7 @@ namespace
         return targetlevel;
     }
 
-    float distance(const osg::BoundingBox& box, const osg::Vec3f& v)
+    float distanceToBox(const osg::BoundingBox& box, const osg::Vec3f& v)
     {
         if (box.contains(v))
             return 0;
@@ -79,7 +79,7 @@ public:
 
     virtual bool isSufficientDetail(QuadTreeNode* node, const osg::Vec3f& eyePoint)
     {
-        float dist = distance(node->getBoundingBox(), eyePoint);
+        float dist = distanceToBox(node->getBoundingBox(), eyePoint);
         int nativeLodLevel = Log2(static_cast<unsigned int>(node->getSize()/mMinSize));
         int lodLevel = Log2(static_cast<unsigned int>(dist/(8192*mMinSize)));