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

Subject: [Boost-commit] svn:boost r72574 - in sandbox-branches/geometry/index_080_new: boost/geometry/extensions/index/rtree tests
From: adam.wulkiewicz_at_[hidden]
Date: 2011-06-13 17:16:16

Author: awulkiew
Date: 2011-06-13 17:16:15 EDT (Mon, 13 Jun 2011)
New Revision: 72574
URL: http://svn.boost.org/trac/boost/changeset/72574

Log:
options moved from index::detail::rtree::options<...> to index::options::rtree<...>
Text files modified: 
   sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/options.hpp |    18 +++++++++++-------                      
   sandbox-branches/geometry/index_080_new/tests/additional_sizes_and_times.cpp              |     2 +-                                      
   2 files changed, 12 insertions(+), 8 deletions(-)

Modified: sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/options.hpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/options.hpp	(original)
+++ sandbox-branches/geometry/index_080_new/boost/geometry/extensions/index/rtree/options.hpp	2011-06-13 17:16:15 EDT (Mon, 13 Jun 2011)
@@ -28,10 +28,10 @@
 // NodeTag
 struct default_tag {};
 
-namespace detail { namespace rtree {
+namespace options {
 
 template <typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
-struct options
+struct rtree
 {
         typedef InsertTag insert_tag;
         typedef ChooseNextNodeTag choose_next_node_tag;
@@ -39,6 +39,10 @@
         typedef NodeTag node_tag;
 };
 
+} // namespace options
+
+namespace detail { namespace rtree {
+
 template <typename Tag>
 struct options_type
 {
@@ -46,27 +50,27 @@
 };
 
 template <typename InsertTag, typename ChooseNextNodeTag, typename RedistributeTag, typename NodeTag>
-struct options_type< options<InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> >
+struct options_type< options::rtree<InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> >
 {
-	typedef options<InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> type;
+	typedef options::rtree<InsertTag, ChooseNextNodeTag, RedistributeTag, NodeTag> type;
 };
 
 template <>
 struct options_type<linear_tag>
 {
-	typedef options<insert_tag, choose_by_area_diff_tag, linear_tag, default_tag> type;
+	typedef options::rtree<insert_tag, choose_by_area_diff_tag, linear_tag, default_tag> type;
 };
 
 template <>
 struct options_type<quadratic_tag>
 {
-	typedef options<insert_tag, choose_by_area_diff_tag, quadratic_tag, default_tag> type;
+	typedef options::rtree<insert_tag, choose_by_area_diff_tag, quadratic_tag, default_tag> type;
 };
 
 template <>
 struct options_type<rstar_tag>
 {
-	typedef options<reinsert_tag, choose_by_overlap_diff_tag, rstar_tag, default_tag> type;
+	typedef options::rtree<reinsert_tag, choose_by_overlap_diff_tag, rstar_tag, default_tag> type;
 };
 
 }} // namespace detail::rtree

Modified: sandbox-branches/geometry/index_080_new/tests/additional_sizes_and_times.cpp
==============================================================================
--- sandbox-branches/geometry/index_080_new/tests/additional_sizes_and_times.cpp	(original)
+++ sandbox-branches/geometry/index_080_new/tests/additional_sizes_and_times.cpp	2011-06-13 17:16:15 EDT (Mon, 13 Jun 2011)
@@ -34,7 +34,7 @@
     typedef bgi::rtree<std::pair<B, size_t>, bgi::rstar_tag> RT;
         /*typedef bgi::rtree<
                 std::pair<B, size_t>,
-		bgi::detail::rtree::options<bgi::reinsert_tag, bgi::choose_by_area_diff_tag, bgi::rstar_tag, bgi::default_tag>
+		bgi::options::rtree<bgi::reinsert_tag, bgi::choose_by_area_diff_tag, bgi::rstar_tag, bgi::default_tag>
 	> RT;*/
 
     // load config file