[Boost-commit] svn:boost r83659 - trunk/boost/geometry/index/detail

Subject: [Boost-commit] svn:boost r83659 - trunk/boost/geometry/index/detail
From: adam.wulkiewicz_at_[hidden]
Date: 2013-03-30 21:28:13

Author: awulkiew
Date: 2013-03-30 21:28:13 EDT (Sat, 30 Mar 2013)
New Revision: 83659
URL: http://svn.boost.org/trac/boost/changeset/83659

Log:
rtree: fixed template parameter types and MPL_ASSERT parameters
Text files modified: 
   trunk/boost/geometry/index/detail/predicates.hpp |     8 +++++---                                
   1 files changed, 5 insertions(+), 3 deletions(-)

Modified: trunk/boost/geometry/index/detail/predicates.hpp
==============================================================================
--- trunk/boost/geometry/index/detail/predicates.hpp	(original)
+++ trunk/boost/geometry/index/detail/predicates.hpp	2013-03-30 21:28:13 EDT (Sat, 30 Mar 2013)
@@ -702,10 +702,11 @@
     }
 };
 
-template <typename Predicate, typename Tag, size_t First, size_t Last>
+template <typename Predicate, typename Tag, unsigned First, unsigned Last>
 struct predicates_check_impl
 {
-    BOOST_MPL_ASSERT_MSG((First < 1 && Last <= 1 && First <= Last), INVALID_INDEXES, (predicates_check_impl));
+    static const bool check = First < 1 && Last <= 1 && First <= Last;
+    BOOST_MPL_ASSERT_MSG((check), INVALID_INDEXES, (predicates_check_impl));
 
     template <typename Value, typename Indexable>
     static inline bool apply(Predicate const& p, Value const& v, Indexable const& i)
@@ -761,7 +762,8 @@
     typedef boost::tuples::cons<Head, Tail> predicates_type;
 
     static const unsigned pred_len = boost::tuples::length<predicates_type>::value;
-    BOOST_MPL_ASSERT_MSG((First < pred_len && Last <= pred_len && First <= Last), INVALID_INDEXES, (predicates_check_impl));
+    static const bool check = First < pred_len && Last <= pred_len && First <= Last;
+    BOOST_MPL_ASSERT_MSG((check), INVALID_INDEXES, (predicates_check_impl));
 
     template <typename Value, typename Indexable>
     static inline bool apply(predicates_type const& p, Value const& v, Indexable const& i)