From bcff6c192cc76b258e2b93e00b393679294c2b2a Mon Sep 17 00:00:00 2001
From: Patrick Niklaus <patrick.niklaus@student.kit.edu>
Date: Mon, 21 Jul 2014 00:37:54 +0200
Subject: [PATCH] Remove template paramters and constexpr in test

Stops clang from complaining about non-constexpr.
---
 UnitTests/DataStructures/StaticRTreeTest.cpp | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/UnitTests/DataStructures/StaticRTreeTest.cpp b/UnitTests/DataStructures/StaticRTreeTest.cpp
index d5cd47fb2..55aeb9e34 100644
--- a/UnitTests/DataStructures/StaticRTreeTest.cpp
+++ b/UnitTests/DataStructures/StaticRTreeTest.cpp
@@ -26,10 +26,10 @@ typedef StaticRTree<TestData,
 
 // Choosen by a fair W20 dice roll (this value is completely arbitrary)
 constexpr unsigned RANDOM_SEED = 15;
-constexpr int32_t WORLD_MIN_LAT = -90*COORDINATE_PRECISION;
-constexpr int32_t WORLD_MAX_LAT = 90*COORDINATE_PRECISION;
-constexpr int32_t WORLD_MIN_LON = -180*COORDINATE_PRECISION;
-constexpr int32_t WORLD_MAX_LON = 180*COORDINATE_PRECISION;
+static const int32_t WORLD_MIN_LAT = -90*COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LAT = 90*COORDINATE_PRECISION;
+static const int32_t WORLD_MIN_LON = -180*COORDINATE_PRECISION;
+static const int32_t WORLD_MAX_LON = 180*COORDINATE_PRECISION;
 
 class LinearSearchNN
 {
@@ -168,11 +168,7 @@ private:
 };
 
 
-template<unsigned NUM_NODES, unsigned NUM_EDGES,
-         int32_t MIN_LON=WORLD_MIN_LON,
-         int32_t MAX_LON=WORLD_MAX_LON,
-         int32_t MIN_LAT=WORLD_MIN_LAT,
-         int32_t MAX_LAT=WORLD_MAX_LAT>
+template<unsigned NUM_NODES, unsigned NUM_EDGES>
 struct RandomGraphFixture
 {
     struct TupleHash
@@ -196,8 +192,8 @@ struct RandomGraphFixture
 
         std::mt19937 g(RANDOM_SEED);
 
-        std::uniform_int_distribution<> lat_udist(MIN_LAT, MAX_LAT);
-        std::uniform_int_distribution<> lon_udist(MIN_LON, MAX_LON);
+        std::uniform_int_distribution<> lat_udist(WORLD_MIN_LAT, WORLD_MAX_LAT);
+        std::uniform_int_distribution<> lon_udist(WORLD_MIN_LON, WORLD_MAX_LON);
 
         for (unsigned i = 0; i < NUM_NODES; i++)
         {