From 6c593d13a9faa550bed2f4f3007a3dca2eb35eae Mon Sep 17 00:00:00 2001
From: Adam Wulkiewicz <adam.wulkiewicz@gmail.com>
Date: Fri, 17 Jun 2011 09:46:03 +0000
Subject: [PATCH] c++98 errors fixed

[SVN r72620]
---
 .../geometry/extensions/index/rtree/node/node_default.hpp | 2 +-
 include/boost/geometry/extensions/index/rtree/options.hpp | 7 +++----
 tests/additional_sizes_and_times.cpp                      | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/include/boost/geometry/extensions/index/rtree/node/node_default.hpp b/include/boost/geometry/extensions/index/rtree/node/node_default.hpp
index 2fc96b381..b189a07b9 100644
--- a/include/boost/geometry/extensions/index/rtree/node/node_default.hpp
+++ b/include/boost/geometry/extensions/index/rtree/node/node_default.hpp
@@ -156,7 +156,7 @@ inline typename Translator::indexable_type const&
 	element_indexable(Value const& el, Translator const& tr)
 {
 	return tr(el);
-};
+}
 
 template <typename Value, typename Parameters, typename Box, typename Tag, typename Translator>
 inline Box const&
diff --git a/include/boost/geometry/extensions/index/rtree/options.hpp b/include/boost/geometry/extensions/index/rtree/options.hpp
index a0fa00f3b..3e704c434 100644
--- a/include/boost/geometry/extensions/index/rtree/options.hpp
+++ b/include/boost/geometry/extensions/index/rtree/options.hpp
@@ -55,21 +55,21 @@ namespace options { namespace detail {
 template <size_t MaxElements>
 struct default_rstar_reinserted_elements
 {
-	static const size_t value = MaxElements * 0.3f;
+	static const size_t value = (MaxElements * 3) / 10;
 };
 
 }} // namespace options::detail
 
 template <size_t MaxElements,
 		  size_t MinElements,
-		  size_t UseNearlyMinimumCost = false,
+		  bool UseNearlyMinimumCost = false,
 		  size_t ReinsertedElements = options::detail::default_rstar_reinserted_elements<MaxElements>::value
 		  >
 struct rstar
 {
 	static const size_t max_elements = MaxElements;
 	static const size_t min_elements = MinElements;
-	static const size_t use_nearly_minimum_cost = UseNearlyMinimumCost;
+	static const bool use_nearly_minimum_cost = UseNearlyMinimumCost;
 	static const size_t reinserted_elements = ReinsertedElements;
 };
 
@@ -93,7 +93,6 @@ template <typename Tag>
 struct options_type
 {
 	// TODO: awulkiew - use static assert
-	typedef void type;
 };
 
 template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
diff --git a/tests/additional_sizes_and_times.cpp b/tests/additional_sizes_and_times.cpp
index a980b1ab7..7b9a66492 100644
--- a/tests/additional_sizes_and_times.cpp
+++ b/tests/additional_sizes_and_times.cpp
@@ -29,12 +29,12 @@ int main()
     typedef bg::model::point<float, 2, bg::cs::cartesian> P;
     typedef bg::model::box<P> B;
     //typedef bgi::rtree<std::pair<B, size_t>, bgi::linear<32, 8> > RT;
-    typedef bgi::rtree<std::pair<B, size_t>, bgi::quadratic<32, 8> > RT;
+    //typedef bgi::rtree<std::pair<B, size_t>, bgi::quadratic<32, 8> > RT;
     //typedef bgi::rtree<std::pair<B, size_t>, bgi::rstar<32, 8, true> > RT;
-	/*typedef bgi::rtree<
+	typedef bgi::rtree<
 		std::pair<B, size_t>,
-		bgi::options::rtree<bgi::linear<32, 8>, bgi::insert_tag, bgi::choose_by_area_diff_tag, bgi::linear_tag, bgi::default_static_tag>
-	> RT;*/
+		bgi::options::rtree<bgi::linear<32, 8>, bgi::insert_tag, bgi::choose_by_area_diff_tag, bgi::quadratic_tag, bgi::default_static_tag>
+	> RT;
 
     // load config file
     std::ifstream file_cfg("config.txt");