boost/graph
2
0
Fork 0
mirror of https://github.com/boostorg/graph.git synced 2026-01-30 07:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Undo a misguided optimization

Browse Source 
[SVN r27798]
This commit is contained in:
Douglas Gregor
2005-03-24 14:12:37 +00:00
parent 88c47b4995
commit 63be68e1cb
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/pending/relaxed_heap.hpp
View File

@@ -133,6 +133,7 @@ public:
if (!a->value
|| *a->value == x
|| compare(x, *a->value)) {
if (a != smallest_value) smallest_value = 0;
a->kind = stored_key;
a->value = x;
promote(a);
@@ -390,17 +391,12 @@ private:
if (A[r + 1] == s) active_sibling_transform(a, s);
else good_sibling_transform(a, s);
}
if (smallest_value && smallest_value != a
&& do_compare(a, smallest_value))
smallest_value = a;
}
}
group* combine(group* a1, group* a2)
{
rank_type r = a1->rank;
assert(r == a2->rank);
assert(a1->rank == a2->rank);
if (do_compare(a2, a1)) do_swap(a1, a2);
a1->children[a1->rank++] = a2;
a2->parent = a1;