[Boost-commit] svn:boost r72620 - in sandbox-branches/geometry/index: boost/geometry/extensions/index/rtree boost/geometry/extensions/index/rtree/node tests

Subject: [Boost-commit] svn:boost r72620 - in sandbox-branches/geometry/index: boost/geometry/extensions/index/rtree boost/geometry/extensions/index/rtree/node tests
From: adam.wulkiewicz_at_[hidden]
Date: 2011-06-17 05:46:04

Author: awulkiew
Date: 2011-06-17 05:46:03 EDT (Fri, 17 Jun 2011)
New Revision: 72620
URL: http://svn.boost.org/trac/boost/changeset/72620

Log:
c++98 errors fixed
Text files modified: 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default.hpp |     2 +-                                      
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp           |     7 +++----                                 
   sandbox-branches/geometry/index/tests/additional_sizes_and_times.cpp                        |     8 ++++----                                
   3 files changed, 8 insertions(+), 9 deletions(-)

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/node/node_default.hpp	2011-06-17 05:46:03 EDT (Fri, 17 Jun 2011)
@@ -156,7 +156,7 @@
         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&

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/options.hpp	2011-06-17 05:46:03 EDT (Fri, 17 Jun 2011)
@@ -55,21 +55,21 @@
 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 @@
 struct options_type
 {
         // TODO: awulkiew - use static assert
-	typedef void type;
 };
 
 template <typename Parameters, typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>

Modified: sandbox-branches/geometry/index/tests/additional_sizes_and_times.cpp
==============================================================================
--- sandbox-branches/geometry/index/tests/additional_sizes_and_times.cpp	(original)
+++ sandbox-branches/geometry/index/tests/additional_sizes_and_times.cpp	2011-06-17 05:46:03 EDT (Fri, 17 Jun 2011)
@@ -29,12 +29,12 @@
     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");