Some sanitization for MSVC

TileDB-Inc · Jan 7, 2025 · aec3e05 · aec3e05
1 parent 50e81c2
commit aec3e05
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/tiledb/common/algorithm/parallel_merge.h b/tiledb/common/algorithm/parallel_merge.h
@@ -311,7 +311,8 @@ class ParallelMerge {
 
     bool operator()(
         const std::span<const T> l, const std::span<const T> r) const {
-      return !(cmp_(l.front(), r.front()));
+      // note that this flips the comparison as it is used in a max heap but we want min
+      return cmp_(r.front(), l.front());
     }
 
     Compare cmp_;

diff --git a/tiledb/common/algorithm/test/unit_parallel_merge.cc b/tiledb/common/algorithm/test/unit_parallel_merge.cc
@@ -234,7 +234,8 @@ struct VerifyTournamentMerge {
 
     // SAFETY: the merge unit will begin writing at index
     // `unit.output_start()`
-    T* output_ptr = &output[-unit.output_start()];
+    T* output_buffer = output.data();
+    T* output_ptr = output_buffer - unit.output_start();
 
     std::vector<std::span<T>> spans;
     for (size_t s = 0; s < streams.size(); s++) {
@@ -297,7 +298,7 @@ struct VerifyParallelMerge {
 
     ThreadPool pool(pool_concurrency);
     auto future =
-        parallel_merge(pool, resources, options, spans, cmp, &output[0]);
+        parallel_merge(pool, resources, options, spans, cmp, &output.data()[0]);
 
     std::optional<uint64_t> prev_bound;
     std::optional<uint64_t> bound;