Subject: [Boost-commit] svn:boost r80463 - in trunk/boost/heap: . detail
From: tim_at_[hidden]
Date: 2012-09-09 09:08:15
Author: timblechmann
Date: 2012-09-09 09:08:14 EDT (Sun, 09 Sep 2012)
New Revision: 80463
URL: http://svn.boost.org/trac/boost/changeset/80463
Log:
heap: fix some inspectin warnings
Text files modified:
trunk/boost/heap/detail/heap_comparison.hpp | 4 ++--
trunk/boost/heap/detail/ilog2.hpp | 2 +-
trunk/boost/heap/detail/ordered_adaptor_iterator.hpp | 4 ++--
trunk/boost/heap/pairing_heap.hpp | 4 ++--
4 files changed, 7 insertions(+), 7 deletions(-)
Modified: trunk/boost/heap/detail/heap_comparison.hpp
==============================================================================
--- trunk/boost/heap/detail/heap_comparison.hpp (original)
+++ trunk/boost/heap/detail/heap_comparison.hpp 2012-09-09 09:08:14 EDT (Sun, 09 Sep 2012)
@@ -141,8 +141,8 @@
heap_equivalence_copy
>::type equivalence_check;
- equivalence_check check;
- return check(lhs, rhs);
+ equivalence_check eq_check;
+ return eq_check(lhs, rhs);
}
Modified: trunk/boost/heap/detail/ilog2.hpp
==============================================================================
--- trunk/boost/heap/detail/ilog2.hpp (original)
+++ trunk/boost/heap/detail/ilog2.hpp 2012-09-09 09:08:14 EDT (Sun, 09 Sep 2012)
@@ -61,4 +61,4 @@
} /* namespace heap */
} /* namespace boost */
-#endif /* BOOST_HEAP_DETAIL_ILOG2_HPP */
\ No newline at end of file
+#endif /* BOOST_HEAP_DETAIL_ILOG2_HPP */
Modified: trunk/boost/heap/detail/ordered_adaptor_iterator.hpp
==============================================================================
--- trunk/boost/heap/detail/ordered_adaptor_iterator.hpp (original)
+++ trunk/boost/heap/detail/ordered_adaptor_iterator.hpp 2012-09-09 09:08:14 EDT (Sun, 09 Sep 2012)
@@ -64,8 +64,8 @@
bool operator()(size_t lhs, size_t rhs)
{
- assert(lhs <= Dispatcher::max_index(container));
- assert(rhs <= Dispatcher::max_index(container));
+ BOOST_ASSERT(lhs <= Dispatcher::max_index(container));
+ BOOST_ASSERT(rhs <= Dispatcher::max_index(container));
return ValueCompare::operator()(Dispatcher::get_internal_value(container, lhs),
Dispatcher::get_internal_value(container, rhs));
}
Modified: trunk/boost/heap/pairing_heap.hpp
==============================================================================
--- trunk/boost/heap/pairing_heap.hpp (original)
+++ trunk/boost/heap/pairing_heap.hpp 2012-09-09 09:08:14 EDT (Sun, 09 Sep 2012)
@@ -100,7 +100,7 @@
* the complexity analysis is yet unsolved. For details, consult:
*
* Pettie, Seth (2005), "Towards a final analysis of pairing heaps",
- * Proc. 46th Annual IEEE Symposium on Foundations of Computer Science, pp. 174–183
+ * Proc. 46th Annual IEEE Symposium on Foundations of Computer Science, pp. 174-183
*
* The template parameter T is the type to be managed by the container.
* The user can specify additional options and if no options are provided default options are used.
@@ -656,7 +656,7 @@
node_pointer merge_node_list(node_child_list & children)
{
- assert(!children.empty());
+ BOOST_HEAP_ASSERT(!children.empty());
node_pointer merged = merge_first_pair(children);
if (children.empty())
return merged;