From 344f39196f4f8d8f9216a842710a185ab87e2d50 Mon Sep 17 00:00:00 2001 From: Jonathan G Rennison Date: Tue, 28 Feb 2017 21:23:52 +0000 Subject: [PATCH] cpp-btree: Remove remaining uses of ssize_t This is due to issues building on Windows --- src/3rdparty/cpp-btree/README | 2 +- src/3rdparty/cpp-btree/btree.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/3rdparty/cpp-btree/README b/src/3rdparty/cpp-btree/README index ad7c897352..de596b58c0 100644 --- a/src/3rdparty/cpp-btree/README +++ b/src/3rdparty/cpp-btree/README @@ -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 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 key_comp - Adding move constructors/assignment. diff --git a/src/3rdparty/cpp-btree/btree.h b/src/3rdparty/cpp-btree/btree.h index 066999c91c..9184e88f94 100644 --- a/src/3rdparty/cpp-btree/btree.h +++ b/src/3rdparty/cpp-btree/btree.h @@ -886,7 +886,7 @@ class btree : public Params::key_compare { }; struct node_stats { - node_stats(ssize_t l, ssize_t i) + node_stats(size_t l, size_t i) : leaf_nodes(l), internal_nodes(i) { } @@ -897,8 +897,8 @@ class btree : public Params::key_compare { return *this; } - ssize_t leaf_nodes; - ssize_t internal_nodes; + size_t leaf_nodes; + size_t internal_nodes; }; public: