From 9a3ab8502df84f2bf647fff3f6d748bfa4e3a3b8 Mon Sep 17 00:00:00 2001
From: Theodore Tsirpanis <theodore.tsirpanis@tiledb.com>
Date: Tue, 30 Jan 2024 19:22:32 +0200
Subject: [PATCH] Fix compile errors.

---
 test/src/unit-tile-metadata.cc                            | 8 ++++++--
 tiledb/sm/serialization/capnp_utils.h                     | 1 +
 .../sm/serialization/test/unit_capnp_nonempty_domain.cc   | 8 +++-----
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/test/src/unit-tile-metadata.cc b/test/src/unit-tile-metadata.cc
index f5853379ce0..27de153ba0d 100644
--- a/test/src/unit-tile-metadata.cc
+++ b/test/src/unit-tile-metadata.cc
@@ -1554,7 +1554,9 @@ struct CPPTileMetadataStringDimFx {
       // Validate mins.
       auto& min = frag_meta[0]->get_min("a");
       CHECK(min.size() == sizeof(double));
-      CHECK(*static_cast<double*>(static_cast<void*>(min.data())) == 4);
+      CHECK(
+          *static_cast<const double*>(static_cast<const void*>(min.data())) ==
+          4);
 
       CHECK_THROWS_WITH(
           frag_meta[0]->get_min("d1"),
@@ -1569,7 +1571,9 @@ struct CPPTileMetadataStringDimFx {
       // Validate maxs.
       auto& max = frag_meta[0]->get_max("a");
       CHECK(max.size() == sizeof(double));
-      CHECK(*static_cast<double*>(static_cast<void*>(max.data())) == 7);
+      CHECK(
+          *static_cast<const double*>(static_cast<const void*>(max.data())) ==
+          7);
 
       CHECK_THROWS_WITH(
           frag_meta[0]->get_max("d1"),
diff --git a/tiledb/sm/serialization/capnp_utils.h b/tiledb/sm/serialization/capnp_utils.h
index efc58528eac..2e6e8f78cfc 100644
--- a/tiledb/sm/serialization/capnp_utils.h
+++ b/tiledb/sm/serialization/capnp_utils.h
@@ -35,6 +35,7 @@
 
 #ifdef TILEDB_SERIALIZATION
 
+#include <capnp/compat/std-iterator.h>
 #include "tiledb-rest.capnp.h"
 
 #include "tiledb/common/heap_memory.h"
diff --git a/tiledb/sm/serialization/test/unit_capnp_nonempty_domain.cc b/tiledb/sm/serialization/test/unit_capnp_nonempty_domain.cc
index 6c61dc7c08a..9f770b519f3 100644
--- a/tiledb/sm/serialization/test/unit_capnp_nonempty_domain.cc
+++ b/tiledb/sm/serialization/test/unit_capnp_nonempty_domain.cc
@@ -55,14 +55,12 @@ TEST_CASE(
   ::capnp::MallocMessageBuilder message;
   tiledb::sm::serialization::capnp::NonEmptyDomainList::Builder builder =
       message.initRoot<tiledb::sm::serialization::capnp::NonEmptyDomainList>();
-  st = tiledb::sm::serialization::utils::serialize_non_empty_domain_rv(
+  tiledb::sm::serialization::utils::serialize_non_empty_domain_rv(
       builder, nd_list, 1);
-  REQUIRE(st.ok());
 
-  auto&& [status, clone] =
+  auto clone =
       tiledb::sm::serialization::utils::deserialize_non_empty_domain_rv(
           builder);
 
-  REQUIRE(status.ok());
-  REQUIRE(clone.value()[0].var_size() == false);
+  REQUIRE(clone[0].var_size() == false);
 }