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.

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 build with GCC 15 #10857

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions prov/opx/include/fi_opx_tid_cache.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
*/
int opx_tid_cache_setup(struct ofi_mr_cache **cache, struct opx_tid_domain *domain);

int opx_tid_cache_add_abort();
void opx_tid_cache_delete_abort();
int opx_tid_cache_add_abort(struct ofi_mr_cache *, struct ofi_mr_entry *);
void opx_tid_cache_delete_abort(struct ofi_mr_cache *, struct ofi_mr_entry *);

enum opx_tid_cache_entry_status {
OPX_TID_CACHE_ENTRY_NOT_FOUND = 0,
Expand Down
2 changes: 1 addition & 1 deletion prov/opx/include/rdma/opx/fi_opx.h
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
// Useful for checking that structures are the correct size and other
// compile-time tests. static_assert has existed since C11 so this
// should be safe, but we have an else clause just in case.
#if defined(static_assert)
#if __STDC_VERSION__ >= 201112L
#define OPX_COMPILE_TIME_ASSERT(cond, msg) static_assert(cond, msg)
#else
#define OPX_COMPILE_TIME_ASSERT(cond, msg) \
Expand Down
4 changes: 2 additions & 2 deletions prov/opx/src/fi_opx_tid_cache.c
Original file line number Diff line number Diff line change
Expand Up @@ -1787,14 +1787,14 @@ void opx_tid_cache_cleanup(struct ofi_mr_cache *cache)
assert(cache->uncached_size == 0);
}

int opx_tid_cache_add_abort()
int opx_tid_cache_add_abort(struct ofi_mr_cache *, struct ofi_mr_entry *)
{
fprintf(stderr, "%s unexpected function call\n", __func__);
abort();
return 0;
}

void opx_tid_cache_delete_abort()
void opx_tid_cache_delete_abort(struct ofi_mr_cache *, struct ofi_mr_entry *)
{
fprintf(stderr, "%s unexpected function call\n", __func__);
abort();
Expand Down
Loading