From 2fa954ed36953a40592f328ce05dc38004ad1354 Mon Sep 17 00:00:00 2001 From: Andrew Noyes Date: Wed, 7 Aug 2024 16:25:49 -0700 Subject: [PATCH] Fix compiler warning --- ConflictSet.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ConflictSet.cpp b/ConflictSet.cpp index ec0d79e..0d08a58 100644 --- a/ConflictSet.cpp +++ b/ConflictSet.cpp @@ -2915,8 +2915,7 @@ checkMaxBetweenExclusiveImpl(Node *n, int begin, int end, // Consume the partial key of `self` (which must exist), and update `self` and // `key` such that `self` is along the search path of `key` void consumePartialKey(Node *&self, std::span &key, - InternalVersionT writeVersion, WriteContext *tls, - ConflictSet::Impl *impl) { + InternalVersionT writeVersion, WriteContext *tls) { assert(self->partialKeyLen > 0); // Handle an existing partial key int commonLen = std::min(self->partialKeyLen, key.size()); @@ -2968,7 +2967,7 @@ Node *insert(Node **self, std::span key, ConflictSet::Impl *impl) { if ((*self)->partialKeyLen > 0) { - consumePartialKey(*self, key, writeVersion, tls, impl); + consumePartialKey(*self, key, writeVersion, tls); } assert(maxVersion(*self, impl) <= writeVersion); setMaxVersion(*self, impl, writeVersion); @@ -2996,7 +2995,7 @@ Node *insert(Node **self, std::span key, key = key.subspan(1, key.size() - 1); if ((*self)->partialKeyLen > 0) { - consumePartialKey(*self, key, writeVersion, tls, impl); + consumePartialKey(*self, key, writeVersion, tls); assert(maxVersion(*self, impl) <= writeVersion); setMaxVersion(*self, impl, writeVersion); }