[Boost-commit] svn:boost r84855 - in trunk/boost/geometry: algorithms index/detail index/detail/rtree/linear index/detail/rtree/quadratic index/detail/rtree/rstar

Subject: [Boost-commit] svn:boost r84855 - in trunk/boost/geometry: algorithms index/detail index/detail/rtree/linear index/detail/rtree/quadratic index/detail/rtree/rstar
From: adam.wulkiewicz_at_[hidden]
Date: 2013-06-20 18:56:09

Author: awulkiew
Date: 2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)
New Revision: 84855
URL: http://svn.boost.org/trac/boost/changeset/84855

Log:
[geometry]: added boost::ignore_unused_variable_warning in covered_by, [index]: BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM removed, boost::ignore_unused_variable_warning used instead.

Text files modified: 
   trunk/boost/geometry/algorithms/covered_by.hpp                              |     2 ++                                      
   trunk/boost/geometry/index/detail/config_begin.hpp                          |     6 ------                                  
   trunk/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp    |     4 ++--                                    
   trunk/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp |     2 +-                                      
   trunk/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp          |     4 ++--                                    
   trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp                    |     2 +-                                      
   trunk/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp     |     2 +-                                      
   trunk/boost/geometry/index/detail/varray.hpp                                |    26 +++++++++++++++++++-------              
   8 files changed, 28 insertions(+), 20 deletions(-)

Modified: trunk/boost/geometry/algorithms/covered_by.hpp
==============================================================================
--- trunk/boost/geometry/algorithms/covered_by.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/algorithms/covered_by.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -47,6 +47,7 @@
     template <typename Strategy>
     static inline bool apply(Point const& point, Box const& box, Strategy const& strategy)
     {
+        ::boost::ignore_unused_variable_warning(strategy);
         return strategy.apply(point, box);
     }
 };
@@ -58,6 +59,7 @@
     static inline bool apply(Box1 const& box1, Box2 const& box2, Strategy const& strategy)
     {
         assert_dimension_equal<Box1, Box2>();
+        ::boost::ignore_unused_variable_warning(strategy);
         return strategy.apply(box1, box2);
     }
 };

Modified: trunk/boost/geometry/index/detail/config_begin.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/config_begin.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/config_begin.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -10,8 +10,6 @@
 
 #ifdef BOOST_MSVC
 
-    #define BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(A) (void)A;
-
     #pragma warning (push)
     #pragma warning (disable : 4512) // assignment operator could not be generated
     #pragma warning (disable : 4127) // conditional expression is constant
@@ -19,9 +17,5 @@
     // temporary?
     #pragma warning (disable : 4180) // qualifier applied to function type has no meaning
 
-#else //BOOST_MSVC
-
-    #define BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(A)
-
 #endif   //BOOST_MSVC
 

Modified: trunk/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/rtree/linear/redistribute_elements.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -136,7 +136,7 @@
         seed1 = highest_low_index;
         seed2 = lowest_high_index;
 
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
+        ::boost::ignore_unused_variable_warning(parameters);
     }
 };
 
@@ -191,7 +191,7 @@
         if ( lowest_index == highest_index )
             seed2 = (lowest_index + 1) % elements_count; // % is just in case since if this is true lowest_index is 0
 
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
+        ::boost::ignore_unused_variable_warning(parameters);
     }
 };
 

Modified: trunk/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/rtree/quadratic/redistribute_elements.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -72,7 +72,7 @@
             }
         }
 
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
+        ::boost::ignore_unused_variable_warning(parameters);
     }
 };
 

Modified: trunk/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/rtree/rstar/choose_next_node.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -47,6 +47,8 @@
                                parameters_type const& parameters,
                                size_t node_relative_level)
     {
+        ::boost::ignore_unused_variable_warning(parameters);
+
         children_type & children = rtree::elements(n);
         
         // children are leafs
@@ -63,8 +65,6 @@
         // children are internal nodes
         else
             return choose_by_minimum_content_cost(children, indexable);
-
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
     }
 
 private:

Modified: trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/rtree/rstar/insert.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -118,7 +118,7 @@
         }
         BOOST_CATCH_END
 
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
+        ::boost::ignore_unused_variable_warning(parameters);
     }
 
 private:

Modified: trunk/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/rtree/rstar/redistribute_elements.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -125,7 +125,7 @@
             }
         }
 
-        BOOST_GEOMETRY_INDEX_DETAIL_USE_PARAM(parameters)
+        ::boost::ignore_unused_variable_warning(parameters);
     }
 };
 

Modified: trunk/boost/geometry/index/detail/varray.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/varray.hpp	Thu Jun 20 17:57:28 2013	(r84854)
+++ trunk/boost/geometry/index/detail/varray.hpp	2013-06-20 18:56:09 EDT (Thu, 20 Jun 2013)	(r84855)
@@ -36,6 +36,8 @@
 #include <boost/geometry/index/detail/assert.hpp>
 #include <boost/geometry/index/detail/varray_detail.hpp>
 
+#include <boost/concept_check.hpp>
+
 /*!
 \defgroup varray_non_member varray non-member functions
 */
@@ -69,8 +71,9 @@
     static inline void check_capacity(Varray const& v, size_type s)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(s <= v.capacity(), "size too big");
-        // unused params
-        (void)v; (void)s;
+
+        ::boost::ignore_unused_variable_warning(v);
+        ::boost::ignore_unused_variable_warning(s);
     }
 
     static inline void throw_out_of_bounds(Varray const& v, size_type i)
@@ -81,31 +84,40 @@
 //#else // BOOST_NO_EXCEPTIONS
 //        BOOST_GEOMETRY_INDEX_ASSERT(i < v.size(), "index out of bounds");
 //#endif // BOOST_NO_EXCEPTIONS
-        (void)v; (void)i;
+
+        ::boost::ignore_unused_variable_warning(v);
+        ::boost::ignore_unused_variable_warning(i);
     }
 
     static inline void check_index(Varray const& v, size_type i)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(i < v.size(), "index out of bounds");
-        (void)v; (void)i;
+
+        ::boost::ignore_unused_variable_warning(v);
+        ::boost::ignore_unused_variable_warning(i);
     }
 
     static inline void check_not_empty(Varray const& v)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(!v.empty(), "the container is empty");
-        (void)v;
+        
+        ::boost::ignore_unused_variable_warning(v);
     }
 
     static inline void check_iterator_end_neq(Varray const& v, const_iterator position)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(v.begin() <= position && position < v.end(), "iterator out of bounds");
-        (void)v; (void)position;
+
+        ::boost::ignore_unused_variable_warning(v);
+        ::boost::ignore_unused_variable_warning(position);
     }
 
     static inline void check_iterator_end_eq(Varray const& v, const_iterator position)
     {
         BOOST_GEOMETRY_INDEX_ASSERT(v.begin() <= position && position <= v.end(), "iterator out of bounds");
-        (void)v; (void)position;
+
+        ::boost::ignore_unused_variable_warning(v);
+        ::boost::ignore_unused_variable_warning(position);
     }
 };