Boost logo

Boost-Commit :

Subject: [Boost-commit] svn:boost r81481 - in sandbox-branches/geometry/index_dev: boost/geometry/extensions/index/rtree boost/geometry/extensions/index/rtree/node boost/geometry/extensions/index/rtree/visitors test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2012-11-22 06:28:22


Author: awulkiew
Date: 2012-11-22 06:28:21 EST (Thu, 22 Nov 2012)
New Revision: 81481
URL: http://svn.boost.org/trac/boost/changeset/81481

Log:
some of warnings fixed.
Text files modified:
   sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/node/node.hpp | 6 +++---
   sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/options.hpp | 19 +++++++++++++++----
   sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/visitors/destroy.hpp | 2 +-
   sandbox-branches/geometry/index_dev/test/rtree/test_rtree.hpp | 2 +-
   4 files changed, 20 insertions(+), 9 deletions(-)

Modified: sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/node/node.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/node/node.hpp (original)
+++ sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/node/node.hpp 2012-11-22 06:28:21 EST (Thu, 22 Nov 2012)
@@ -109,9 +109,9 @@
         }
     }
 
- 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*/)
     {}
 };
 

Modified: sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/options.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/options.hpp (original)
+++ sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/options.hpp 2012-11-22 06:28:21 EST (Thu, 22 Nov 2012)
@@ -148,19 +148,30 @@
     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; }

Modified: sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/visitors/destroy.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/visitors/destroy.hpp (original)
+++ sandbox-branches/geometry/index_dev/boost/geometry/extensions/index/rtree/visitors/destroy.hpp 2012-11-22 06:28:21 EST (Thu, 22 Nov 2012)
@@ -52,7 +52,7 @@
         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");
 

Modified: sandbox-branches/geometry/index_dev/test/rtree/test_rtree.hpp
==============================================================================
--- sandbox-branches/geometry/index_dev/test/rtree/test_rtree.hpp (original)
+++ sandbox-branches/geometry/index_dev/test/rtree/test_rtree.hpp 2012-11-22 06:28:21 EST (Thu, 22 Nov 2012)
@@ -327,7 +327,7 @@
 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*/)
     {}
 };
 


Boost-Commit list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk