From 397078758eb7635feb3a67c66dd736c62542e48c Mon Sep 17 00:00:00 2001
From: "Daniel J. Hofmann" <daniel@trvx.org>
Date: Wed, 2 Sep 2015 20:02:28 +0200
Subject: [PATCH] Remove boost/thread from rtree, include header for
 hash_combine in unit test.

The `static_rtree.hpp` header included `<booost/thread.hpp>` without using
anything from this header.

Removing it showed why:

the unit test for the rtree no longer built, since it was missing symbols
for Boost's `hash_combine`, used in the unit test.

Instead of relying on `<boost/thread.hpp>` including the proper header
for `hash_combine` by chance that we only use in the unit test, do the
following:

- remove `<boost/thread.hpp>` from the rtree implementation
- add `<boost/functional/hash.hpp>` to the rtree unit test

As always, include what you use.
---
 data_structures/static_rtree.hpp            | 2 +-
 unit_tests/data_structures/static_rtree.cpp | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data_structures/static_rtree.hpp b/data_structures/static_rtree.hpp
index 314935a68..d1a63fb26 100644
--- a/data_structures/static_rtree.hpp
+++ b/data_structures/static_rtree.hpp
@@ -50,7 +50,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <boost/assert.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
-#include <boost/thread.hpp>
+#include <boost/range/irange.hpp>
 
 #include <tbb/parallel_for.h>
 #include <tbb/parallel_sort.h>
diff --git a/unit_tests/data_structures/static_rtree.cpp b/unit_tests/data_structures/static_rtree.cpp
index 57636473a..73fbc88a5 100644
--- a/unit_tests/data_structures/static_rtree.cpp
+++ b/unit_tests/data_structures/static_rtree.cpp
@@ -32,6 +32,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "../../util/floating_point.hpp"
 #include "../../typedefs.h"
 
+#include <boost/functional/hash.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_case_template.hpp>
 #include <boost/mpl/list.hpp>