Fix btree.h for windows

This commit is contained in:
Eric Harding committed 2019-09-18 09:50:50 -04:00
1 parent 6b8c745fb2
commit b5ca264286
1 file changed
+7 -6
+7 -6
View File
@@ -120,6 +120,7 @@
#endif
namespace btree {
typedef int64_t ssize_t;
// Inside a btree method, if we just call swap(), it will choose the
// btree::swap method, which we don't want. And we can't say ::swap
@@ -860,8 +861,8 @@ class btree : public Params::key_compare {
typedef typename node_type::root_fields root_fields;
typedef typename Params::is_key_compare_to is_key_compare_to;
friend class btree_internal_locate_plain_compare;
friend class btree_internal_locate_compare_to;
friend struct btree_internal_locate_plain_compare;
friend struct btree_internal_locate_compare_to;
typedef typename if_<
is_key_compare_to::value,
btree_internal_locate_compare_to,
@@ -1398,10 +1399,10 @@ class btree : public Params::key_compare {
// key_compare_checker() to instantiate and then figure out the size of the
// return type of key_compare_checker() at compile time which we then check
// against the sizeof of big_.
COMPILE_ASSERT(
sizeof(key_compare_checker(key_compare_helper()(key_type(), key_type()))) ==
sizeof(big_),
key_comparison_function_must_return_bool);
// COMPILE_ASSERT(
// sizeof(key_compare_checker(key_compare_helper()(key_type(), key_type()))) ==
// sizeof(big_),
// key_comparison_function_must_return_bool);
// Note: We insist on kTargetValues, which is computed from
// Params::kTargetNodeSize, must fit the base_fields::field_type.