From 594da6aef317cce3080d35331e45ad8946c60a4c Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Fri, 2 May 2025 12:48:02 +0100
Subject: [PATCH] Fix merge issues and new compiler complaints
---
src/engine_redistribute.c | 2 +-
src/threadpool.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/engine_redistribute.c b/src/engine_redistribute.c
index a34c17d00c..a09e527bee 100644
--- a/src/engine_redistribute.c
+++ b/src/engine_redistribute.c
@@ -1231,7 +1231,7 @@ void engine_redistribute(struct engine *e) {
s->size_bparts = engine_redistribute_alloc_margin * nr_bparts_new;
/* Sink particles. */
- new_parts = engine_do_redistribute(
+ new_parts = engine_do_redistribute(e,
"sinks", sink_counts, (char *)s->sinks, nr_sinks_new, sizeof(struct sink),
sink_align, sink_mpi_type, nr_nodes, nodeID, e->syncredist);
swift_free("sinks", s->sinks);
diff --git a/src/threadpool.c b/src/threadpool.c
index 2e11f0193d..8e13a52052 100644
--- a/src/threadpool.c
+++ b/src/threadpool.c
@@ -499,7 +499,7 @@ void *threadpool_memcpy(struct threadpool *tp, void *dest, void *src,
/* Need a number of pages per thread to be worth while. See:
* https://gitlab.cosma.dur.ac.uk/swift/swiftsim/-/merge_requests/1661
*/
- if ((n < 8 * 4096 * tp->num_threads) || tp->num_threads < 8) {
+ if ((n < (size_t)(8 * 4096 * tp->num_threads)) || (tp->num_threads < 8)) {
memcpy(dest, src, n);
} else {
/* Also we see most of the gains (80%) using less than the total number of
--
GitLab