diff --git a/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp b/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp
index 7a81aa9f7..06e212412 100644
--- a/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp
+++ b/include/boost/geometry/extensions/index/rtree/rstar/redistribute_elements.hpp
@@ -301,7 +301,10 @@ template <size_t Corner>
 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");
 
diff --git a/include/boost/geometry/extensions/index/static_vector.hpp b/include/boost/geometry/extensions/index/static_vector.hpp
index e9180e81c..3bad6f5c3 100644
--- a/include/boost/geometry/extensions/index/static_vector.hpp
+++ b/include/boost/geometry/extensions/index/static_vector.hpp
@@ -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 @@ public:
     }
 
     // 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");
     }
diff --git a/test/rtree/test_rtree.hpp b/test/rtree/test_rtree.hpp
index 31ec99c54..f3d1de6a3 100644
--- a/test/rtree/test_rtree.hpp
+++ b/test/rtree/test_rtree.hpp
@@ -274,7 +274,6 @@ struct def< counting_value<Indexable> >
     bool equals(value_type const& v1, value_type const& v2) const
     {
         return boost::geometry::equals(v1.indexable, v2.indexable);
-        return false;
     }
 };