dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-btree' into jgrpp

Browse Source
This commit is contained in:
Jonathan G Rennison
2017-02-28 21:25:50 +00:00
parent deb6a4f5c1 344f39196f
commit 7f66d4bc6a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/3rdparty/cpp-btree/README vendored
View File

@@ -35,7 +35,7 @@ cmake . -G "Unix Makefiles" -Dbuild_tests=ON -DCMAKE_CXX_COMPILER=clang++
Note that this is a modified version of the original at http://code.google.com/p/cpp-btree Note that this is a modified version of the original at http://code.google.com/p/cpp-btree
Changes include: Changes include:
- Changing size_type from ssize_t to size_t - Changing size_type from ssize_t to size_t, remove remaining uses of ssize_t
- Adding cbegin, cend, crbegin, crend. - Adding cbegin, cend, crbegin, crend.
- Adding key_comp - Adding key_comp
- Adding move constructors/assignment. - Adding move constructors/assignment.

6
src/3rdparty/cpp-btree/btree.h vendored
View File

@@ -886,7 +886,7 @@ class btree : public Params::key_compare {
}; };
struct node_stats { struct node_stats {
node_stats(ssize_t l, ssize_t i) node_stats(size_t l, size_t i)
: leaf_nodes(l), : leaf_nodes(l),
internal_nodes(i) { internal_nodes(i) {
} }
@@ -897,8 +897,8 @@ class btree : public Params::key_compare {
return *this; return *this;
} }
ssize_t leaf_nodes; size_t leaf_nodes;
ssize_t internal_nodes; size_t internal_nodes;
}; };
public: public: