[Boost-commit] svn:boost r81923 - in sandbox-branches/geometry/index: boost/geometry/extensions/index boost/geometry/extensions/index/rtree/rstar test/rtree

Subject: [Boost-commit] svn:boost r81923 - in sandbox-branches/geometry/index: boost/geometry/extensions/index boost/geometry/extensions/index/rtree/rstar test/rtree
From: adam.wulkiewicz_at_[hidden]
Date: 2012-12-13 18:08:37

Author: awulkiew
Date: 2012-12-13 18:08:37 EST (Thu, 13 Dec 2012)
New Revision: 81923
URL: http://svn.boost.org/trac/boost/changeset/81923

Log:
Some VS warnings fixed.
Text files modified: 
   sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp |     5 ++++-                                   
   sandbox-branches/geometry/index/boost/geometry/extensions/index/static_vector.hpp                     |     5 +++--                                   
   sandbox-branches/geometry/index/test/rtree/test_rtree.hpp                                             |     1 -                                       
   3 files changed, 7 insertions(+), 4 deletions(-)

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp	2012-12-13 18:08:37 EST (Thu, 13 Dec 2012)
@@ -301,7 +301,10 @@
 struct partial_sort<Corner, 1>
 {
     template <typename Elements, typename Translator>
-    static inline void apply(Elements & elements, const size_t axis, const size_t index, Translator const& tr)
+    static inline void apply(Elements & elements,
+                             const size_t BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(axis),
+                             const size_t index,
+                             Translator const& tr)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(axis == 0, "unexpected axis value");
 

Modified: sandbox-branches/geometry/index/boost/geometry/extensions/index/static_vector.hpp
==============================================================================
--- sandbox-branches/geometry/index/boost/geometry/extensions/index/static_vector.hpp	(original)
+++ sandbox-branches/geometry/index/boost/geometry/extensions/index/static_vector.hpp	2012-12-13 18:08:37 EST (Thu, 13 Dec 2012)
@@ -7,9 +7,10 @@
 // http://www.boost.org/LICENSE_1_0.txt)
 
 #include <boost/aligned_storage.hpp>
-#include <boost/assert.hpp>
 #include <boost/iterator/reverse_iterator.hpp>
 
+#include <boost/geometry/extensions/index/assert.hpp>
+
 #ifndef BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP
 #define BOOST_GEOMETRY_EXTENSIONS_INDEX_STATIC_VECTOR_HPP
 
@@ -109,7 +110,7 @@
     }
 
     // nothrow
-    void reserve(size_type s)
+    void reserve(size_type BOOST_GEOMETRY_INDEX_ASSERT_UNUSED_PARAM(s))
     {
         BOOST_ASSERT_MSG(s <= Capacity, "max capacity reached");
     }

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	2012-12-13 18:08:37 EST (Thu, 13 Dec 2012)
@@ -274,7 +274,6 @@
     bool equals(value_type const& v1, value_type const& v2) const
     {
         return boost::geometry::equals(v1.indexable, v2.indexable);
-        return false;
     }
 };