[Boost-commit] svn:boost r38330 - trunk/boost/pending

From: dgregor_at_[hidden]
Date: 2007-07-31 17:58:37

Author: dgregor
Date: 2007-07-31 17:58:36 EDT (Tue, 31 Jul 2007)
New Revision: 38330
URL: http://svn.boost.org/trac/boost/changeset/38330

Log:
relaxed_heap.hpp:
  - Use boost::none in all the right places. Fixes #1072. Big thanks to
    David Gleich!

Text files modified: 
   trunk/boost/pending/relaxed_heap.hpp |     7 ++++---                                 
   1 files changed, 4 insertions(+), 3 deletions(-)

Modified: trunk/boost/pending/relaxed_heap.hpp
==============================================================================
--- trunk/boost/pending/relaxed_heap.hpp	(original)
+++ trunk/boost/pending/relaxed_heap.hpp	2007-07-31 17:58:36 EDT (Tue, 31 Jul 2007)
@@ -14,6 +14,7 @@
 #include <boost/optional.hpp>
 #include <vector>
 #include <climits> // for CHAR_BIT
+#include <boost/none.hpp>
 
 #ifdef BOOST_RELAXED_HEAP_DEBUG
 #  include <iostream>
@@ -173,14 +174,14 @@
   value_type& top()
   {
     find_smallest();
-    assert(smallest_value->value != 0);
+    assert(smallest_value->value != none);
     return *smallest_value->value;
   }
 
   const value_type& top() const
   {
     find_smallest();
-    assert(smallest_value->value != 0);
+    assert(smallest_value->value != none);
     return *smallest_value->value;
   }
 
@@ -203,7 +204,7 @@
     rank_type r = x->rank;
     group* p = x->parent;
     {
-      assert(x->value != 0);
+      assert(x->value != none);
 
       // Find x's group
       size_type start = get(id, *x->value) - get(id, *x->value) % log_n;