merging intrusive from develop

This commit is contained in:
Ion Gaztañaga
2019-02-27 16:13:20 +01:00
2 changed files with 3 additions and 2 deletions

View File

@@ -3887,6 +3887,7 @@ to be inserted in intrusive containers are allocated using `std::vector` or `std
* [@https://github.com/boostorg/intrusive/pull/33 GitHub Pull #33: ['Fix compilation in case if key is void*, again]]
* [@https://github.com/boostorg/intrusive/issues/35 GitHub Issue #35: ['key_of_value on treap_set seems to be broken in 1.69]]
* [@https://github.com/boostorg/intrusive/issues/38 GitHub Issue #38: ['treap: Same type for priority and key comparison leads to ambiguous base class error]]
* [@https://github.com/boostorg/intrusive/pull/39 GitHub Pull #39: ['Fix -Wextra-semi clang warnings]]
[endsect]

View File

@@ -564,7 +564,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
NodeTraits::set_parent(node, node_ptr());
NodeTraits::set_left(node, node_ptr());
NodeTraits::set_right(node, node_ptr());
};
}
//! <b>Effects</b>: Returns true if node is in the same state as if called init(node)
//!
@@ -576,7 +576,7 @@ class bstree_algorithms : public bstree_algorithms_base<NodeTraits>
return !NodeTraits::get_parent(node) &&
!NodeTraits::get_left(node) &&
!NodeTraits::get_right(node) ;
};
}
//! <b>Requires</b>: node must not be part of any tree.
//!