Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the aggregates CPP API install files. #4441

Merged
merged 2 commits into from
Oct 23, 2023
Merged

Fix the aggregates CPP API install files. #4441

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3e69a9
Fix the aggregates CPP API install files.
KiterLuc Oct 23, 2023
2a27744
Also install cpp_api/channel_operator.h
eddelbuettel Oct 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions tiledb/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,8 @@ if (TILEDB_CPP_API)
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/as_built_experimental.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/attribute.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/attribute_experimental.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/channel_operation.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/channel_operator.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/config.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/consolidation_plan_experimental.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/context.h
Expand All @@ -112,6 +114,7 @@ if (TILEDB_CPP_API)
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/object.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/object_iter.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/query.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/query_channel.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/query_condition_experimental.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/query_condition.h
${TILEDB_CORE_INCLUDE_DIR}/tiledb/sm/cpp_api/query_experimental.h
Expand Down
4 changes: 3 additions & 1 deletion tiledb/sm/cpp_api/channel_operation.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,9 @@ class ChannelOperation {
* @param query The TileDB query
* @param input_field The attribute name the aggregate operation will run on
*/
template <std::derived_from<ChannelOperator> Op>
template <
class Op,
std::enable_if_t<std::is_base_of_v<ChannelOperator, Op>, bool> = true>
static ChannelOperation create(
const Query& query, const std::string& input_field) {
const Context& ctx = query.ctx();
Expand Down
4 changes: 3 additions & 1 deletion tiledb/sm/cpp_api/query_experimental.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,9 @@ class QueryExperimental {
* @param input_field The attribute name as input for the aggregate
* @return The aggregate operation
*/
template <std::derived_from<ChannelOperator> Op>
template <
class Op,
std::enable_if_t<std::is_base_of_v<ChannelOperator, Op>, bool> = true>
static ChannelOperation create_unary_aggregate(
const Query& query, const std::string& input_field) {
return ChannelOperation::create<Op>(query, input_field);
Expand Down
Loading