From 00383826617ec0b435faa5777cce0111eca2dfae Mon Sep 17 00:00:00 2001
From: Andrew Noyes <andrew@weaselab.dev>
Date: Fri, 8 Mar 2024 13:11:46 -0800
Subject: [PATCH] Prepare to bitpack node fields if desired

---
 ConflictSet.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/ConflictSet.cpp b/ConflictSet.cpp
index 3f57c71..7be48e0 100644
--- a/ConflictSet.cpp
+++ b/ConflictSet.cpp
@@ -1613,7 +1613,8 @@ void addWriteRange(Node *&root, int64_t oldestVersion,
 
   auto *beginNode = insert<true>(useAsRoot, begin, writeVersion, impl);
 
-  const bool insertedBegin = !std::exchange(beginNode->entryPresent, true);
+  const bool insertedBegin = !beginNode->entryPresent;
+  beginNode->entryPresent = true;
 
   if (insertedBegin) {
     auto *p = nextLogical(beginNode);
@@ -1630,7 +1631,8 @@ void addWriteRange(Node *&root, int64_t oldestVersion,
 
   auto *endNode = insert<false>(useAsRoot, end, writeVersion, impl);
 
-  const bool insertedEnd = !std::exchange(endNode->entryPresent, true);
+  const bool insertedEnd = !endNode->entryPresent;
+  endNode->entryPresent = true;
 
   if (insertedEnd) {
     auto *p = nextLogical(endNode);