vitalif
/
cpp-btree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

merge into: vitalif:extra-data
Branches Tags
vitalif:master
vitalif:extra-data
...
pull from: vitalif:master
Branches Tags
vitalif:master
vitalif:extra-data

3 Commits
extra-data ... master

Author SHA1 Message Date
Vitaliy Filippov 8de8b467ac Fix "partly outside array bounds" warnings for GCC 12 2024-01-15 18:04:01 +03:00
Vitaliy Filippov 45e6d1f131 Replace deprecated allocator::rebind with allocator_traits::rebind_alloc 2022-05-10 10:50:36 +03:00
Vitaliy Filippov 6e20146406 Fix "btree_internal_locate_* previously defined as class" warnings 2022-01-15 23:37:53 +03:00
1 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

12
btree.h
View File

@ -574,9 +574,9 @@ class btree_node {
btree_node* child(int i) const { return fields_.children[i]; } btree_node* child(int i) const { return fields_.children[i]; }
btree_node** mutable_child(int i) { return &fields_.children[i]; } btree_node** mutable_child(int i) { return &fields_.children[i]; }
void set_child(int i, btree_node *c) { void set_child(int i, btree_node *c) {
*mutable_child(i) = c; reinterpret_cast<internal_fields*>(this)->children[i] = c;
c->fields_.parent = this; reinterpret_cast<internal_fields*>(c)->parent = this;
c->fields_.position = i; reinterpret_cast<internal_fields*>(c)->position = i;
} }
// Returns the position of the first value whose key is not less than k. // Returns the position of the first value whose key is not less than k.
@ -862,8 +862,8 @@ class btree : public Params::key_compare {
typedef typename node_type::root_fields root_fields; typedef typename node_type::root_fields root_fields;
typedef typename Params::is_key_compare_to is_key_compare_to; typedef typename Params::is_key_compare_to is_key_compare_to;
friend class btree_internal_locate_plain_compare; friend struct btree_internal_locate_plain_compare;
friend class btree_internal_locate_compare_to; friend struct btree_internal_locate_compare_to;
typedef typename if_< typedef typename if_<
is_key_compare_to::value, is_key_compare_to::value,
btree_internal_locate_compare_to, btree_internal_locate_compare_to,
@ -927,7 +927,7 @@ class btree : public Params::key_compare {
typedef std::reverse_iterator<iterator> reverse_iterator; typedef std::reverse_iterator<iterator> reverse_iterator;
typedef typename Params::allocator_type allocator_type; typedef typename Params::allocator_type allocator_type;
typedef typename allocator_type::template rebind<char>::other typedef typename std::allocator_traits<allocator_type>::template rebind_alloc<char>
internal_allocator_type; internal_allocator_type;
public: public: