fix capnp generated files after rebase

TileDB-Inc · Oct 12, 2023 · b99a11c · b99a11c
1 parent a2484e2
commit b99a11c
Show file tree

Hide file tree

Showing 6 changed files with 21,265 additions and 78,838 deletions.
diff --git a/tiledb/sm/query/readers/aggregators/operation.h b/tiledb/sm/query/readers/aggregators/operation.h
@@ -70,10 +70,10 @@ class MinOperation : public Operation {
         // change (STRING_ASCII,CHAR) mapping in apply_with_type
         if constexpr (std::is_same_v<char, decltype(T)>) {
           aggregator_ =
-              std::make_shared<tiledb::sm::MinAggregator<std::string>>(fi);
+              tdb::make_shared<tiledb::sm::MinAggregator<std::string>>(HERE(), fi);
         } else {
           aggregator_ =
-              std::make_shared<tiledb::sm::MinAggregator<decltype(T)>>(fi);
+              tdb::make_shared<tiledb::sm::MinAggregator<decltype(T)>>(HERE(), fi);
         }
       } else {
         throw std::logic_error(
@@ -100,10 +100,10 @@ class MaxOperation : public Operation {
         // change (STRING_ASCII,CHAR) mapping in apply_with_type
         if constexpr (std::is_same_v<char, decltype(T)>) {
           aggregator_ =
-              std::make_shared<tiledb::sm::MaxAggregator<std::string>>(fi);
+              tdb::make_shared<tiledb::sm::MaxAggregator<std::string>>(HERE(), fi);
         } else {
           aggregator_ =
-              std::make_shared<tiledb::sm::MaxAggregator<decltype(T)>>(fi);
+              tdb::make_shared<tiledb::sm::MaxAggregator<decltype(T)>>(HERE(), fi);
         }
       } else {
         throw std::logic_error(
@@ -124,7 +124,7 @@ class SumOperation : public Operation {
       if constexpr (tiledb::type::TileDBNumeric<decltype(T)>) {
         ensure_aggregate_numeric_field(constants::aggregate_sum_str, fi);
         aggregator_ =
-            std::make_shared<tiledb::sm::SumAggregator<decltype(T)>>(fi);
+            tdb::make_shared<tiledb::sm::SumAggregator<decltype(T)>>(HERE(), fi);
       } else {
         throw std::logic_error(
             "Sum aggregates can only be requested on numeric types");
@@ -138,7 +138,7 @@ class CountOperation : public Operation {
  public:
   // For nullary operations, default constructor makes sense
   CountOperation() {
-    aggregator_ = std::make_shared<tiledb::sm::CountAggregator>();
+    aggregator_ = tdb::make_shared<tiledb::sm::CountAggregator>(HERE());
   }
 };