Non-gcc compiler fixes take 15

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

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/test/src/unit-sparse-global-order-reader.cc b/test/src/unit-sparse-global-order-reader.cc
@@ -2468,7 +2468,7 @@ void CSparseGlobalOrderFx::run(Instance instance) {
   auto outatts = out.attributes();
   std::apply(
       [&](auto&... field) {
-        (field.resize(std::max(static_cast<size_t>(1), expect.size()), 0), ...);
+        (field.resize(std::max<uint64_t>(1, expect.size()), 0), ...);
       },
       std::tuple_cat(outdims, outatts));
 

diff --git a/test/support/src/array_templates.h b/test/support/src/array_templates.h
@@ -258,7 +258,7 @@ struct query_applicator {
    * @return a tuple containing the size of each input field
    */
   static auto make_field_sizes(
-      const std::tuple<Ts&...> fields,
+      const std::tuple<std::decay_t<Ts>&...> fields,
       uint64_t cell_limit = std::numeric_limits<uint64_t>::max()) {
     std::optional<uint64_t> num_cells;
     auto make_field_size = [&]<typename T>(const std::vector<T>& field) {
@@ -288,7 +288,7 @@ struct query_applicator {
       tiledb_ctx_t* ctx,
       tiledb_query_t* query,
       auto& field_sizes,
-      std::tuple<Ts&...> fields,
+      std::tuple<std::decay_t<Ts>&...> fields,
       std::function<std::string(unsigned)> fieldname,
       uint64_t cell_offset = 0) {
     auto set_data_buffer =