some of warnings fixed.

[SVN r81481]
This commit is contained in:
Adam Wulkiewicz
2012-11-22 11:28:21 +00:00
parent b42b3e3c9f
commit 0ccbb1fe0c
4 changed files with 20 additions and 9 deletions

View File

@@ -109,9 +109,9 @@ struct destroy_elements
}
}
inline static void apply(typename leaf::elements_type::iterator first,
typename leaf::elements_type::iterator last,
Allocators &)
inline static void apply(typename leaf::elements_type::iterator /*first*/,
typename leaf::elements_type::iterator /*last*/,
Allocators & /*allocators*/)
{}
};

View File

@@ -148,19 +148,30 @@ private:
size_t min_elements;
};
namespace detail {
inline size_t default_rstar_reinserted_elements()
{
return (std::numeric_limits<size_t>::max)();
};
} // namespace options::detail
class rstar
{
public:
static const size_t default_reinserted_elements = -1;
rstar(size_t max_elements_,
size_t min_elements_,
size_t overlap_cost_threshold_ = 0,
size_t reinserted_elements_ = default_reinserted_elements)
size_t reinserted_elements_ = detail::default_rstar_reinserted_elements())
: max_elements(max_elements_)
, min_elements(min_elements_)
, overlap_cost_threshold(overlap_cost_threshold_)
, reinserted_elements(default_reinserted_elements == reinserted_elements_ ? (max_elements_ * 3) / 10 : reinserted_elements_)
, reinserted_elements(
detail::default_rstar_reinserted_elements() == reinserted_elements_ ?
(max_elements_ * 3) / 10 :
reinserted_elements_
)
{}
size_t get_max_elements() const { return max_elements; }

View File

@@ -52,7 +52,7 @@ public:
rtree::destroy_node<Allocators, internal_node>::apply(m_allocators, node_to_destroy);
}
inline void operator()(leaf & l)
inline void operator()(leaf & BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(l))
{
BOOST_GEOMETRY_INDEX_ASSERT(&l == rtree::get<leaf>(m_current_node), "invalid pointers");

View File

@@ -327,7 +327,7 @@ template <>
struct test_overlap_impl<bg::point_tag>
{
template <typename Value, typename Algo, typename Box>
static void apply(bgi::rtree<Value, Algo> const& tree, std::vector<Value> const& input, Box const& qbox)
static void apply(bgi::rtree<Value, Algo> const& /*tree*/, std::vector<Value> const& /*input*/, Box const& /*qbox*/)
{}
};