Subject: [Boost-commit] svn:boost r82850 - in sandbox-branches/geometry/index: boost/geometry/index/detail boost/geometry/index/detail/rtree/rstar boost/geometry/index/detail/rtree/visitors test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2013-02-13 09:57:44
Author: awulkiew
Date: 2013-02-13 09:57:43 EST (Wed, 13 Feb 2013)
New Revision: 82850
URL: http://svn.boost.org/trac/boost/changeset/82850
Log:
compilation errors related to detail::rtree::get fixed
Text files modified:
sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp | 2
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/rstar/insert.hpp | 6 ++--
sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp | 2
sandbox-branches/geometry/index/test/rtree/test_rtree.hpp | 50 ++++++++++++++++++---------------------
4 files changed, 28 insertions(+), 32 deletions(-)
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/predicates.hpp 2013-02-13 09:57:43 EST (Wed, 13 Feb 2013)
@@ -554,7 +554,7 @@
struct predicates_check_pair<PairPredicates, Tag, I, I>
{
template <typename Value, typename Indexable>
- static inline bool apply(PairPredicates const& p, Value const& v, Indexable const& i)
+ static inline bool apply(PairPredicates const& , Value const& , Indexable const& )
{
return true;
}
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/rstar/insert.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/rstar/insert.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/rstar/insert.hpp 2013-02-13 09:57:43 EST (Wed, 13 Feb 2013)
@@ -197,7 +197,7 @@
// node is root node
else
{
- BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<Node>(base::m_root_node), "node should be the root node");
+ BOOST_GEOMETRY_INDEX_ASSERT(&n == &rtree::get<Node>(*base::m_root_node), "node should be the root node");
base::split(n); // MAY THROW (V, E: alloc, copy, N: alloc)
}
}
@@ -445,7 +445,7 @@
inline void operator()(internal_node & BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(n))
{
- BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<internal_node>(m_root), "current node should be the root");
+ BOOST_GEOMETRY_INDEX_ASSERT(&n == &rtree::get<internal_node>(*m_root), "current node should be the root");
rstar::level_insert<0, Element, Value, Options, Translator, Box, Allocators> lins_v(
m_root, m_leafs_level, m_element, m_parameters, m_translator, m_allocators, m_relative_level);
@@ -460,7 +460,7 @@
inline void operator()(leaf & BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(n))
{
- BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<leaf>(m_root), "current node should be the root");
+ BOOST_GEOMETRY_INDEX_ASSERT(&n == &rtree::get<leaf>(*m_root), "current node should be the root");
rstar::level_insert<0, Element, Value, Options, Translator, Box, Allocators> lins_v(
m_root, m_leafs_level, m_element, m_parameters, m_translator, m_allocators, m_relative_level);
Modified: sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp (original)
+++ sandbox-branches/geometry/index/boost/geometry/index/detail/rtree/visitors/remove.hpp 2013-02-13 09:57:43 EST (Wed, 13 Feb 2013)
@@ -110,7 +110,7 @@
// n is root node
else
{
- BOOST_GEOMETRY_INDEX_ASSERT(&n == rtree::get<internal_node>(m_root_node), "node must be the root");
+ BOOST_GEOMETRY_INDEX_ASSERT(&n == &rtree::get<internal_node>(*m_root_node), "node must be the root");
// assign new root's box
assign_root_box(elements);
Modified: sandbox-branches/geometry/index/test/rtree/test_rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index/test/rtree/test_rtree.hpp (original)
+++ sandbox-branches/geometry/index/test/rtree/test_rtree.hpp 2013-02-13 09:57:43 EST (Wed, 13 Feb 2013)
@@ -565,8 +565,8 @@
// rtree specific queries tests
-template <typename Value, typename Algo, typename T, typename A, typename Box>
-void test_intersects(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+template <typename Rtree, typename Value, typename Box>
+void test_intersects(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
std::vector<Value> expected_output;
@@ -589,8 +589,8 @@
test_spatial_query(tree, !bgi::disjoint(qpoly), expected_output);*/
}
-template <typename Value, typename Algo, typename T, typename A, typename Box>
-void test_disjoint(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+template <typename Rtree, typename Value, typename Box>
+void test_disjoint(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
std::vector<Value> expected_output;
@@ -611,8 +611,8 @@
}
-template <typename Value, typename Algo, typename T, typename A, typename Box>
-void test_covered_by(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+template <typename Rtree, typename Value, typename Box>
+void test_covered_by(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
std::vector<Value> expected_output;
@@ -634,8 +634,8 @@
template <typename Tag>
struct test_overlap_impl
{
- template <typename Value, typename Algo, typename T, typename A, typename Box>
- static void apply(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+ template <typename Rtree, typename Value, typename Box>
+ static void apply(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
std::vector<Value> expected_output;
@@ -658,17 +658,17 @@
template <>
struct test_overlap_impl<bg::point_tag>
{
- template <typename Value, typename Algo, typename T, typename A, typename Box>
- static void apply(bgi::rtree<Value, Algo, T, A> const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
+ template <typename Rtree, typename Value, typename Box>
+ static void apply(Rtree const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
{}
};
-template <typename Value, typename Algo, typename T, typename A, typename Box>
-void test_overlaps(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+template <typename Rtree, typename Value, typename Box>
+void test_overlaps(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
test_overlap_impl<
typename bgi::detail::traits::tag<
- typename bgi::rtree<Value, Algo>::indexable_type
+ typename Rtree::indexable_type
>::type
>::apply(tree, input, qbox);
}
@@ -676,16 +676,16 @@
//template <typename Tag, size_t Dimension>
//struct test_touches_impl
//{
-// template <typename Value, typename Algo, typename T, typename A, typename Box>
-// static void apply(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+// template <typename Rtree, typename Value, typename Box>
+// static void apply(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
// {}
//};
//
//template <>
//struct test_touches_impl<bg::box_tag, 2>
//{
-// template <typename Value, typename Algo, typename T, typename A, typename Box>
-// static void apply(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+// template <typename Rtree, typename Value, typename Box>
+// static void apply(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
// {
// std::vector<Value> expected_output;
//
@@ -697,21 +697,17 @@
// }
//};
//
-//template <typename Value, typename Algo, typename T, typename A, typename Box>
-//void test_touches(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+//template <typename Rtree, typename Value, typename Box>
+//void test_touches(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
//{
// test_touches_impl<
-// bgi::traits::tag<
-// typename bgi::rtree<Value, Algo, T, A>::indexable_type
-// >::type,
-// bgi::traits::dimension<
-// typename bgi::rtree<Value, Algo, T, A>::indexable_type
-// >::value
+// bgi::traits::tag<typename Rtree::indexable_type>::type,
+// bgi::traits::dimension<typename Rtree::indexable_type>::value
// >::apply(tree, input, qbox);
//}
-template <typename Value, typename Algo, typename T, typename A, typename Box>
-void test_within(bgi::rtree<Value, Algo, T, A> const& tree, std::vector<Value> const& input, Box const& qbox)
+template <typename Rtree, typename Value, typename Box>
+void test_within(Rtree const& tree, std::vector<Value> const& input, Box const& qbox)
{
std::vector<Value> expected_output;