From 5fcce2c68f82650a65fbeee0321ce1a1fc8d01ad Mon Sep 17 00:00:00 2001
From: "Peter W. Draper" <p.w.draper@durham.ac.uk>
Date: Tue, 29 May 2018 16:08:39 +0100
Subject: [PATCH] Add void to empty function argument lists
Fix C++ adversion to type demotion from long long to float
---
src/engine.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/engine.c b/src/engine.c
index c8b159cac6..db59901859 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -5351,7 +5351,7 @@ static cpu_set_t *engine_entry_affinity(void) {
* @brief Ensure the NUMA node on which we initialise (first touch) everything
* doesn't change before engine_init allocates NUMA-local workers.
*/
-void engine_pin() {
+void engine_pin(void) {
#ifdef HAVE_SETAFFINITY
cpu_set_t *entry_affinity = engine_entry_affinity();
@@ -5373,7 +5373,7 @@ void engine_pin() {
/**
* @brief Unpins the main thread.
*/
-void engine_unpin() {
+void engine_unpin(void) {
#ifdef HAVE_SETAFFINITY
pthread_t main_thread = pthread_self();
cpu_set_t *entry_affinity = engine_entry_affinity();
@@ -6218,7 +6218,7 @@ void engine_recompute_displacement_constraint(struct engine *e) {
const long long total_nr_dm_gparts =
e->total_nr_gparts - e->total_nr_parts - e->total_nr_sparts;
float count_parts[swift_type_count] = {
- e->total_nr_parts, total_nr_dm_gparts, 0.f, 0.f, e->total_nr_sparts, 0.f};
+ (float)e->total_nr_parts, (float)total_nr_dm_gparts, 0.f, 0.f, (float)e->total_nr_sparts, 0.f};
/* Count of particles for the two species */
const float N_dm = count_parts[1];
--
GitLab